Commit-ID: fb39b423a214cc3866bbaef78a11af62cae56d31 Gitweb: http://git.kernel.org/tip/fb39b423a214cc3866bbaef78a11af62cae56d31 Author: Heiko Carstens <heiko.carstens@xxxxxxxxxx> AuthorDate: Wed, 29 Apr 2009 13:51:39 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 29 Apr 2009 14:04:10 +0200 tracing: fix build failure on s390 "tracing: create automated trace defines" causes this compile error on s390, as reported by Sachin Sant against linux-next: kernel/built-in.o: In function `__do_softirq': (.text+0x1c680): undefined reference to `__tracepoint_softirq_entry' This happens because the definitions of the softirq tracepoints were moved from kernel/softirq.c to kernel/irq/handle.c. Since s390 doesn't support generic hardirqs handle.c doesn't get compiled and the definitions are missing. So move the tracepoints to softirq.c again. [ Impact: fix build failure on s390 ] Reported-by: Sachin Sant <sachinp@xxxxxxxxxx> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: fweisbec@xxxxxxxxx LKML-Reference: <20090429135139.5fac79b8@xxxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/irq/handle.c | 2 -- kernel/softirq.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 37c6363..e68bb5a 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -18,8 +18,6 @@ #include <linux/rculist.h> #include <linux/hash.h> #include <linux/bootmem.h> - -#define CREATE_TRACE_POINTS #include <trace/events/irq.h> #include "internals.h" diff --git a/kernel/softirq.c b/kernel/softirq.c index 7ab9dfd..d4ba347 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -24,6 +24,8 @@ #include <linux/ftrace.h> #include <linux/smp.h> #include <linux/tick.h> + +#define CREATE_TRACE_POINTS #include <trace/events/irq.h> #include <asm/irq.h> -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html