diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-04-29 13:51:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 14:06:21 +0200 |
| commit | a0e39ed378fb6ba916522764cd508fa7d42ad495 (patch) | |
| tree | e696fef3ec7daebb8861e002b3e7432a209baae4 | |
| parent | 8b3725621074040d380664964ffbc40610aef8c6 (diff) | |
| download | op-kernel-dev-a0e39ed378fb6ba916522764cd508fa7d42ad495.zip op-kernel-dev-a0e39ed378fb6ba916522764cd508fa7d42ad495.tar.gz | |
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.c | 2 | ||||
| -rw-r--r-- | 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> |
