From 16a32effd32a3dbc0f6612e93880d2934ac24e82 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 14 Apr 2009 15:36:18 +0200
Subject: [PATCH] --- yaml --- r: 143387 b: refs/heads/master c:
 81f64b87731aa33eef6b88af9d92c3398d48cf41 h: refs/heads/master i:   143385:
 49210088c52ebe6d6e7d77e61a1113e610ffa461   143383:
 85c204fd9396eccb6d43266723f000e982d18235 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/nmi.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9ad00624cee1..51d06ac32da9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a93e11f9b9604134373ae790bce738d62109de60
+refs/heads/master: 81f64b87731aa33eef6b88af9d92c3398d48cf41
diff --git a/trunk/arch/s390/kernel/nmi.c b/trunk/arch/s390/kernel/nmi.c
index 4bfdc421d7e9..28cf196ba775 100644
--- a/trunk/arch/s390/kernel/nmi.c
+++ b/trunk/arch/s390/kernel/nmi.c
@@ -10,6 +10,7 @@
 
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/hardirq.h>
 #include <linux/time.h>
 #include <linux/module.h>
 #include <asm/lowcore.h>
@@ -253,7 +254,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
 	struct mci *mci;
 	int umode;
 
-	lockdep_off();
+	nmi_enter();
 	s390_idle_check();
 
 	mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
@@ -363,7 +364,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
 		mcck->warning = 1;
 		set_thread_flag(TIF_MCCK_PENDING);
 	}
-	lockdep_on();
+	nmi_exit();
 }
 
 static int __init machine_check_init(void)