Re: [PATCH 2.6.32] ftrace: fix event format export

From: Ingo Molnar
Date: Fri Nov 13 2009 - 17:40:27 EST



( extended the Cc:s. Please try to Cc: people you think would be
interested in your patches. )

* Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote:

> For some reason the export of the event print
> format to userspace uses '#fmt' which breaks
> if the format string is anything but a plain
> string, for example if it is built with macros
> then the macro names are exported instead of
> their contents.
>
> Use
> "\"%s\"", fmt
> instead of
> "%s", #fmt
> to export the string and not the way it is built.
>
> Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> This is making the export of a bunch of events (only checked the
> wireless ones but those are all affected) unusable, so please apply to
> 2.6.32.
>
> include/trace/ftrace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- wireless-testing.orig/include/trace/ftrace.h 2009-11-13 13:15:21.000000000 +0100
> +++ wireless-testing/include/trace/ftrace.h 2009-11-13 13:34:03.000000000 +0100
> @@ -159,7 +159,7 @@
> #undef __get_str
>
> #undef TP_printk
> -#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
> +#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)
>
> #undef TP_fast_assign
> #define TP_fast_assign(args...) args
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/