From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 72/75] signals: move trace header #include to after all others. Date: Fri, 19 Aug 2011 14:27:44 +0100 Message-ID: <1313760467-8598-72-git-send-email-ian.campbell@citrix.com> References: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain Cc: linux-kernel@vger.kernel.org, Ian Campbell , Tejun Heo , Oleg Nesterov , Frederic Weisbecker , Ingo Molnar , Steven Rostedt To: netdev@vger.kernel.org Return-path: In-Reply-To: <1313760393.5010.356.camel@zakaz.uk.xensource.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Steven Rostedt says: The trace events headers are suppose to be the last headers included. and this fixes a build error when another header already includes trace stuff, which I saw when adding a highmem.h include to skbuff.h e.g.: 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) See http://lkml.kernel.org/r/1313668307.5010.300.camel@zakaz.uk.xensource.com Signed-off-by: Ian Campbell Cc: Tejun Heo Cc: Oleg Nesterov Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Steven Rostedt --- kernel/signal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index 291c970..d3cd4e7 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -28,8 +28,6 @@ #include #include #include -#define CREATE_TRACE_POINTS -#include #include #include @@ -37,6 +35,9 @@ #include #include "audit.h" /* audit_signal_info() */ +#define CREATE_TRACE_POINTS +#include + /* * SLAB caches for signal bits. */ -- 1.7.2.5