[tip:tracing/core] tracing: fix build failure on s390

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-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • [tip:tracing/core] tracing: fix build failure on s390
    ... "tracing: create automated trace defines" causes this compile error on s390, ... fix build failure on s390] ...
    (Linux-Kernel)
  • Re: Fix quilt merge error in acpi-cpufreq.c
    ... Side note: I really prefer to see the compile error output in this case: great ... Fix staging/rt28x0 printk format warnings: ... I suspect _every_ commit message can be improved. ... I don't think a "perfect" changelog exists. ...
    (Linux-Kernel)
  • Re: Anti-wobble (I hope)
    ... This *fix* is pushing th' design beyond th' stresses ... Pointing out potential flaws with a *fix* doesn't mean I have th' ... Some poor bastid goes down due to th' stress failure and ... I'm referring to the non-catastrophic failures such as cracked castings, ...
    (rec.motorcycles.harley)
  • [GIT PULL] tracing bits for v2.6.30
    ... The tracing tree depends on the new printk facilities factored ... IA64 ftrace support ... kmemtrace to trace SLAB allocation/freeing and usage patterns ... Fix TRACING_SUPPORT dependency for PPC32 ...
    (Linux-Kernel)
  • Re: does it need a new power supply?
    ... Provided was a very first thing that one does for this failure. ... Long before trying to fix it, first, identify it and its ... toggled the HD power switches a dozen times. ...
    (alt.sys.pc-clone.dell)
Loading