---

yaml --- r: 31807 b: refs/heads/master c: 8e9ccae h: refs/heads/master i: 31805: 50d12f5 31803: ec464d2 31799: 63b299b 31791: d850f5c 31775: 128eae2 31743: 8db48ef v: v3
git-mirror · Jul 3, 2006 · 751c8fe · 751c8fe
1 parent 76698e2
commit 751c8fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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();
 }
 
 /*