aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-04-29 07:51:39 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-29 08:06:21 -0400
commita0e39ed378fb6ba916522764cd508fa7d42ad495 (patch)
treee696fef3ec7daebb8861e002b3e7432a209baae4
parent8b3725621074040d380664964ffbc40610aef8c6 (diff)
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@in.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: fweisbec@gmail.com LKML-Reference: <20090429135139.5fac79b8@osiris.boeblingen.de.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/irq/handle.c2
-rw-r--r--kernel/softirq.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 37c63633e78b..e68bb5aebe02 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -18,8 +18,6 @@
18#include <linux/rculist.h> 18#include <linux/rculist.h>
19#include <linux/hash.h> 19#include <linux/hash.h>
20#include <linux/bootmem.h> 20#include <linux/bootmem.h>
21
22#define CREATE_TRACE_POINTS
23#include <trace/events/irq.h> 21#include <trace/events/irq.h>
24 22
25#include "internals.h" 23#include "internals.h"
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7ab9dfd8d082..d4ba347a872d 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -24,6 +24,8 @@
24#include <linux/ftrace.h> 24#include <linux/ftrace.h>
25#include <linux/smp.h> 25#include <linux/smp.h>
26#include <linux/tick.h> 26#include <linux/tick.h>
27
28#define CREATE_TRACE_POINTS
27#include <trace/events/irq.h> 29#include <trace/events/irq.h>
28 30
29#include <asm/irq.h> 31#include <asm/irq.h>