[patch/s390 18/46] ftrace: dont trace machine check handler

[Martin Schwidefsky <schwidefsky@de.ibm.com>]

[-- Attachment #1: 117-ftrace-notrace.diff --]
[-- Type: text/plain, Size: 949 bytes --]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

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 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: quilt-2.6/drivers/s390/s390mach.c
===================================================================
--- quilt-2.6.orig/drivers/s390/s390mach.c
+++ quilt-2.6/drivers/s390/s390mach.c
@@ -357,8 +357,7 @@ s390_revalidate_registers(struct mci *mc
 /*
  * 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;

-- 
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.