Commit a0e39ed378fb6ba916522764cd508fa7d42ad495

Authored by Heiko Carstens
Committed by Ingo Molnar
1 parent 8b37256210

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>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -18,8 +18,6 @@
18 18 #include <linux/rculist.h>
19 19 #include <linux/hash.h>
20 20 #include <linux/bootmem.h>
21   -
22   -#define CREATE_TRACE_POINTS
23 21 #include <trace/events/irq.h>
24 22  
25 23 #include "internals.h"
... ... @@ -24,6 +24,8 @@
24 24 #include <linux/ftrace.h>
25 25 #include <linux/smp.h>
26 26 #include <linux/tick.h>
  27 +
  28 +#define CREATE_TRACE_POINTS
27 29 #include <trace/events/irq.h>
28 30  
29 31 #include <asm/irq.h>