From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 26 Mar 2009 14:23:59 +0000 (+0100)
Subject: [S390] ftrace: dont trace machine check handler
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cc54c1e66e4b90ab657464fec30e6970636ee23d;p=linux-2.6-omap-h63xx.git

[S390] ftrace: dont trace machine check handler

The ftrace code is currently not reentrant, so we better don't trace
our machine check handler. Machine checks are handled like NMIs on s390.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 92b0417f8e1..8e437052e07 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -357,8 +357,7 @@ s390_revalidate_registers(struct mci *mci)
 /*
  * machine check handler.
  */
-void
-s390_do_machine_check(struct pt_regs *regs)
+void notrace s390_do_machine_check(struct pt_regs *regs)
 {
 	static DEFINE_SPINLOCK(ipd_lock);
 	static unsigned long long last_ipd;