linux/include/trace
Stephen Rothwell 645dae969c tracing, net: fix net tree and tracing tree merge interaction
Today's linux-next build (powerpc ppc64_defconfig) failed like this:

 In file included from net/core/skbuff.c:69:
 include/trace/skb.h:4: error: expected ')' before '(' token
 include/trace/skb.h:4: error: expected ')' before '(' token
 [...]

Caused by commit 2939b0469d ("tracing:
replace TP<var> with TP_<var>") from the tracing tree interacting with
commit 4893d39e86 ("Network Drop Monitor:
Add trace declaration for skb frees") from the net tree.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-02 00:50:30 +02:00
..
block.h tracing: replace TP<var> with TP_<var> 2009-03-10 00:35:04 -04:00
boot.h tracing/fastboot: include missing headers 2008-12-12 09:26:13 +01:00
irq_event_types.h tracing: tracepoints for softirq entry/exit - tracepoints 2009-03-12 21:20:58 -04:00
irq.h tracing, genirq: add irq enter and exit trace events 2009-02-26 18:43:50 +01:00
kmemtrace.h tracing/kmemtrace: normalize the raw tracer event to the unified tracing API 2008-12-30 09:36:13 +01:00
lockdep_event_types.h tracing: remove obsolete TRACE_EVENT_FORMAT macro 2009-03-10 00:35:12 -04:00
lockdep.h tracing: add lockdep tracepoints for lock acquire/release 2009-03-04 18:49:58 +01:00
power.h tracing: replace TP<var> with TP_<var> 2009-03-10 00:35:04 -04:00
sched_event_types.h tracing: flip the TP_printk and TP_fast_assign in the TRACE_EVENT macro 2009-03-10 12:41:38 -04:00
sched.h tracing: add schedule events to event trace 2009-02-24 21:54:07 -05:00
skb.h tracing, net: fix net tree and tracing tree merge interaction 2009-04-02 00:50:30 +02:00
trace_event_types.h tracing: add lockdep tracepoints for lock acquire/release 2009-03-04 18:49:58 +01:00
trace_events.h tracing: add lockdep tracepoints for lock acquire/release 2009-03-04 18:49:58 +01:00
workqueue.h tracing: replace TP<var> with TP_<var> 2009-03-10 00:35:04 -04:00