On Thu, Aug 13, 2009 at 04:35:01PM -0400, Masami Hiramatsu wrote: > Use TRACE_FIELD_ZERO(type, item) instead of TRACE_FIELD_ZERO_CHAR(item). > This also includes a fix of TRACE_ZERO_CHAR() macro.
I can't find what the fix is about (see below) > > Signed-off-by: Masami Hiramatsu <[email protected]> > Cc: Ananth N Mavinakayanahalli <[email protected]> > Cc: Avi Kivity <[email protected]> > Cc: Andi Kleen <[email protected]> > Cc: Christoph Hellwig <[email protected]> > Cc: Frank Ch. Eigler <[email protected]> > Cc: Frederic Weisbecker <[email protected]> > Cc: H. Peter Anvin <[email protected]> > Cc: Ingo Molnar <[email protected]> > Cc: Jason Baron <[email protected]> > Cc: Jim Keniston <[email protected]> > Cc: K.Prasad <[email protected]> > Cc: Lai Jiangshan <[email protected]> > Cc: Li Zefan <[email protected]> > Cc: Przemysław Pawełczyk <[email protected]> > Cc: Roland McGrath <[email protected]> > Cc: Sam Ravnborg <[email protected]> > Cc: Srikar Dronamraju <[email protected]> > Cc: Steven Rostedt <[email protected]> > Cc: Tom Zanussi <[email protected]> > Cc: Vegard Nossum <[email protected]> > --- > > kernel/trace/trace_event_types.h | 4 ++-- > kernel/trace/trace_export.c | 16 ++++++++-------- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/kernel/trace/trace_event_types.h > b/kernel/trace/trace_event_types.h > index 6db005e..e74f090 100644 > --- a/kernel/trace/trace_event_types.h > +++ b/kernel/trace/trace_event_types.h > @@ -109,7 +109,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, > ignore, > TRACE_STRUCT( > TRACE_FIELD(unsigned long, ip, ip) > TRACE_FIELD(char *, fmt, fmt) > - TRACE_FIELD_ZERO_CHAR(buf) > + TRACE_FIELD_ZERO(char, buf) > ), > TP_RAW_FMT("%08lx (%d) fmt:%p %s") > ); > @@ -117,7 +117,7 @@ TRACE_EVENT_FORMAT(bprint, TRACE_BPRINT, bprint_entry, > ignore, > TRACE_EVENT_FORMAT(print, TRACE_PRINT, print_entry, ignore, > TRACE_STRUCT( > TRACE_FIELD(unsigned long, ip, ip) > - TRACE_FIELD_ZERO_CHAR(buf) > + TRACE_FIELD_ZERO(char, buf) > ), > TP_RAW_FMT("%08lx (%d) fmt:%p %s") > ); > diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c > index 71c8d7f..b0ac92c 100644 > --- a/kernel/trace/trace_export.c > +++ b/kernel/trace/trace_export.c > @@ -42,9 +42,9 @@ extern void __bad_type_size(void); > if (!ret) \ > return 0; > > -#undef TRACE_FIELD_ZERO_CHAR > -#define TRACE_FIELD_ZERO_CHAR(item) \ > - ret = trace_seq_printf(s, "\tfield:char " #item ";\t" \ > +#undef TRACE_FIELD_ZERO > +#define TRACE_FIELD_ZERO(type, item) \ > + ret = trace_seq_printf(s, "\tfield:" #type " " #item ";\t" \ > "offset:%u;\tsize:0;\n", \ > (unsigned int)offsetof(typeof(field), item)); \ > if (!ret) \ > @@ -92,9 +92,6 @@ ftrace_format_##call(struct ftrace_event_call *unused, > \ > > #include "trace_event_types.h" > > -#undef TRACE_ZERO_CHAR > -#define TRACE_ZERO_CHAR(arg) > - > #undef TRACE_FIELD > #define TRACE_FIELD(type, item, assign)\ > entry->item = assign; > @@ -107,6 +104,9 @@ ftrace_format_##call(struct ftrace_event_call *unused, > \ > #define TRACE_FIELD_SIGN(type, item, assign, is_signed) \ > TRACE_FIELD(type, item, assign) > > +#undef TRACE_FIELD_ZERO > +#define TRACE_FIELD_ZERO(type, item) > + Is it about the above moving? If so, could you just tell so that I can add something about it in the changelog. Thanks. Frederic. > #undef TP_CMD > #define TP_CMD(cmd...) cmd > > @@ -178,8 +178,8 @@ __attribute__((section("_ftrace_events"))) event_##call = > { \ > if (ret) \ > return ret; > > -#undef TRACE_FIELD_ZERO_CHAR > -#define TRACE_FIELD_ZERO_CHAR(item) > +#undef TRACE_FIELD_ZERO > +#define TRACE_FIELD_ZERO(type, item) > > #undef TRACE_EVENT_FORMAT > #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ > > > -- > Masami Hiramatsu > > Software Engineer > Hitachi Computer Products (America), Inc. > Software Solutions Division > > e-mail: [email protected] -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
