commit cc54c1e66e4b90ab657464fec30e6970636ee23d
author Heiko Carstens <heiko.carstens@de.ibm.com> Thu Mar 26 15:23:59 2009 +0100
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Thu Mar 26 15:24:09 2009 +0100
tree f682870f693a57cf113be2774be30c60b4dc77d2
parent 92e6ecf392fac3082653ac9d84b1bdf53d0ea160

[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>

drivers/s390/s390mach.c

diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 92b0417..8e43705 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -357,8 +357,7 @@
 /*
  * 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;