[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-a0e39ed378fb6ba916522764cd508fa7d42ad495@git.kernel.org>
Date: Wed, 29 Apr 2009 12:10:01 GMT
From: tip-bot for Heiko Carstens <heiko.carstens@...ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
rostedt@...dmis.org, sachinp@...ibm.com, heiko.carstens@...ibm.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:tracing/core] tracing: fix build failure on s390
Commit-ID: a0e39ed378fb6ba916522764cd508fa7d42ad495
Gitweb: http://git.kernel.org/tip/a0e39ed378fb6ba916522764cd508fa7d42ad495
Author: Heiko Carstens <heiko.carstens@...ibm.com>
AuthorDate: Wed, 29 Apr 2009 13:51:39 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 29 Apr 2009 14:06:21 +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@...ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: fweisbec@...il.com
LKML-Reference: <20090429135139.5fac79b8@...ris.boeblingen.de.ibm.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists