aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-03-26 10:23:59 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-26 10:24:09 -0400
commitcc54c1e66e4b90ab657464fec30e6970636ee23d (patch)
treef682870f693a57cf113be2774be30c60b4dc77d2
parent92e6ecf392fac3082653ac9d84b1bdf53d0ea160 (diff)
[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>
-rw-r--r--drivers/s390/s390mach.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c
index 92b0417f8e12..8e437052e076 100644
--- a/drivers/s390/s390mach.c
+++ b/drivers/s390/s390mach.c
@@ -357,8 +357,7 @@ s390_revalidate_registers(struct mci *mci)
357/* 357/*
358 * machine check handler. 358 * machine check handler.
359 */ 359 */
360void 360void notrace s390_do_machine_check(struct pt_regs *regs)
361s390_do_machine_check(struct pt_regs *regs)
362{ 361{
363 static DEFINE_SPINLOCK(ipd_lock); 362 static DEFINE_SPINLOCK(ipd_lock);
364 static unsigned long long last_ipd; 363 static unsigned long long last_ipd;