Re: [PATCH 1/8] tracing: consolidate trace and trace_event headers

[Steven Rostedt]

On Tue, 14 Apr 2009, Frederic Weisbecker wrote:

> On Tue, Apr 14, 2009 at 01:23:38PM -0400, Steven Rostedt wrote:
> > From: Steven Rostedt <srostedt@xxxxxxxxxx>
> > 
> > Impact: clean up
> > 
> > Neil Horman (et. al.) criticized the way the trace events were broken up
> > into two files. The reason for that was that ftrace needed to separate out
> > the declarations from where the #include <linux/tracepoint.h> was used.
> > It then dawned on me that the tracepoint.h header only needs to define the
> > TRACE_EVENT macro if it is not already defined.
> > 
> > The solution is simply to test if TRACE_EVENT is defined, and if it is not
> > then the linux/tracepoint.h header can define it. This change consolidates
> > all the <traces>.h and <traces>_event_types.h into the <traces>.h file.
> > 
> > Reported-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
> > Reported-by: Theodore Tso <tytso@xxxxxxx>
> > Reported-by: Jiaying Zhang <jiayingz@xxxxxxxxxx>
> > Cc: Zhaolei <zhaolei@xxxxxxxxxxxxxx>
> > Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> > Cc: Jason Baron <jbaron@xxxxxxxxxx>
> > Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
> > Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> > ---
> >  include/linux/tracepoint.h          |    9 +-
> >  include/trace/irq.h                 |   51 +++++-
> >  include/trace/irq_event_types.h     |   55 ------
> >  include/trace/kmem.h                |  189 +++++++++++++++++++-
> >  include/trace/lockdep.h             |   52 +++++-
> >  include/trace/lockdep_event_types.h |   57 ------
> >  include/trace/sched.h               |  333 ++++++++++++++++++++++++++++++++++-
> >  include/trace/sched_event_types.h   |  337 -----------------------------------
> >  include/trace/skb.h                 |   36 ++++-
> >  include/trace/skb_event_types.h     |   38 ----
> >  include/trace/trace_event_types.h   |    7 -
> >  kernel/trace/events.c               |    1 +
> >  kernel/trace/trace_events_stage_1.h |    4 +-
> >  kernel/trace/trace_events_stage_2.h |    8 +-
> >  kernel/trace/trace_events_stage_3.h |    4 +-
> >  15 files changed, 663 insertions(+), 518 deletions(-)
> >  delete mode 100644 include/trace/irq_event_types.h
> >  delete mode 100644 include/trace/lockdep_event_types.h
> >  delete mode 100644 include/trace/sched_event_types.h
> >  delete mode 100644 include/trace/skb_event_types.h
> >  delete mode 100644 include/trace/trace_event_types.h
> 
> 
> 
> I don't know if you use git-format-patch without -M or
> something else specific to git pull request. But it looks
> like the renames are not detected here, so it's a bit
> hard to know what have been actually happened or deleted
> in the end result.
> 

Hmm, good point. I use git format-patch with no options and then use quilt 
to send the emair. I always want the patches to work with quilt, thus I 
avoid anything git specific.

My repo is public, so anyone can still look at it and run any git command 
they want.

-- Steve

--
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/