From 751c8fe3e201192bd7ade00fba0d6d8be5394a8d Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 3 Jul 2006 00:25:00 -0700
Subject: [PATCH] --- yaml --- r: 31807 b: refs/heads/master c:
 8e9ccae6ee2bb19b7752b7d412e1bbbaf28e7fe1 h: refs/heads/master i:   31805:
 50d12f577dbd14900c88d5fdbaa9e49a5c91ee0a   31803:
 ec464d22f85292f9a2beeb2d849080a184f9cafc   31799:
 63b299bfe45941f7f0d7aebc302006bfc084ba7f   31791:
 d850f5c0d6397aca1894b7a3741c72e7381d676f   31775:
 128eae258495a0fb77cd942b3002208da8f30e14   31743:
 8db48ef2c16457e95e3cefb6a1479b47272df6e6 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/s390/s390mach.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2251680bd9ef..92cef0615f37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6205120044bb75ca06019491d1aa0e727fdd35be
+refs/heads/master: 8e9ccae6ee2bb19b7752b7d412e1bbbaf28e7fe1
diff --git a/trunk/drivers/s390/s390mach.c b/trunk/drivers/s390/s390mach.c
index 432136f96e64..ffb3677e354f 100644
--- a/trunk/drivers/s390/s390mach.c
+++ b/trunk/drivers/s390/s390mach.c
@@ -378,6 +378,8 @@ s390_do_machine_check(struct pt_regs *regs)
 	struct mcck_struct *mcck;
 	int umode;
 
+	lockdep_off();
+
 	mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
 	mcck = &__get_cpu_var(cpu_mcck);
 	umode = user_mode(regs);
@@ -482,6 +484,7 @@ s390_do_machine_check(struct pt_regs *regs)
 		mcck->warning = 1;
 		set_thread_flag(TIF_MCCK_PENDING);
 	}
+	lockdep_on();
 }
 
 /*