Hi Stephen,
2008/12/11 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in
> include/linux/ftrace.h between commit
> 9c24624727f6d6c460e45762a408ca5f5b9b8ef2 ("KSYM_SYMBOL_LEN fixes") from
> Linus' tree and commit 3f5ec13696fd4a33bde42f385406cbb1d3cc96fd
> ("tracing/fastboot: move boot tracer structs and funcs into their own
> header") from the ftrace tree.
>
> The latter moved some code that the former fixed. I fixed it up as best
> I could (see below - I used the ftrace tree version of
> include/linux/ftrace.h), but it should be checked and a merge with Linus'
> tree done to resolve this conflict.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
> diff --git a/include/trace/boot.h b/include/trace/boot.h
> index 6b54537..3ec58b4 100644
> --- a/include/trace/boot.h
> +++ b/include/trace/boot.h
> @@ -9,7 +9,7 @@
> */
> struct boot_trace_call {
> pid_t caller;
> - char func[KSYM_NAME_LEN];
> + char func[KSYM_SYMBOL_LEN];
> };
>
> /*
> @@ -17,7 +17,7 @@ struct boot_trace_call {
> * while it returns.
> */
> struct boot_trace_ret {
> - char func[KSYM_NAME_LEN];
> + char func[KSYM_SYMBOL_LEN];
> int result;
> unsigned long long duration; /* nsecs */
> };
>
Yes that's the right fix. The headers for the boot tracer have moved
for 2.6.29 merge window and the fix
should follow this move. If you agree, I will submit your patch to
latest -tip with the right "from " and
"signed-off-by" tags....
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
