Messages in this thread Patch in this message | | | Subject | how to handle tracing .h loops | From | Ian Campbell <> | Date | Thu, 18 Aug 2011 12:51:47 +0100 |
| |
Hi,
I'm working on a patch which needs to add a #include <linux/highmem.h> to <linux/skbuff.h>. This is causing a bunch of fallout in the trace headers which I can't figure out the right solution to. Simplifying the patch to just:
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7b996ed..3f5ee74 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -29,6 +29,7 @@ #include <linux/rcupdate.h> #include <linux/dmaengine.h> #include <linux/hrtimer.h> +#include <linux/highmem.h> /* Don't change this without changing skb_csum_unnecessary! */ #define CHECKSUM_NONE 0 reproduces on an i386 defconfig (v3.1-rc2). (actually just including interrupt.h is sufficient too).
The spew is:
In file included from include/trace/ftrace.h:296:0, from include/trace/define_trace.h:96, from include/trace/events/irq.h:150, from include/linux/interrupt.h:23, from arch/x86/include/asm/highmem.h:23, from include/linux/highmem.h:33, from include/linux/skbuff.h:32, from kernel/audit.h:24, from kernel/signal.c:38: include/trace/events/irq.h: In function 'ftrace_raw_output_softirq': include/trace/events/irq.h:87:1: error: 'HI_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: note: each undeclared identifier is reported only once for each function it appears in include/trace/events/irq.h:87:1: error: 'TIMER_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'NET_TX_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'NET_RX_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'BLOCK_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'BLOCK_IOPOLL_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'TASKLET_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'SCHED_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'HRTIMER_SOFTIRQ' undeclared (first use in this function) include/trace/events/irq.h:87:1: error: 'RCU_SOFTIRQ' undeclared (first use in this function)
There are more following that but I suspect they are just secondary fallout so I've omitted them in the interests of brevity. Full log is attached.
The reason I can't see a solution is that it seems to be that trace/events/irq.h in included in linux/interrupt.h before the definition of the enum with all those values in it.
I looked in tip.git#perf/core (and master) but I can't see anything which relates to this issue.
Clearly other places are including interrupt.h and highmem.h without issue so what am I doing wrong here?
Thanks, Ian. [unhandled content-type:application/octet-stream] | |