From 17d7ac5896f1a84273e08467767a24178864ad9e Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 7 Jul 2009 16:37:05 +0200
Subject: [PATCH] --- yaml --- r: 155282 b: refs/heads/master c:
 bb8c29caffdda55d3df0315ff2485f7df7290b1d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/s390/lib/delay.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e6839c11960d..93ed6310ecd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9935774217afd4cdda81ffd70e56dc6406710b06
+refs/heads/master: bb8c29caffdda55d3df0315ff2485f7df7290b1d
diff --git a/trunk/arch/s390/lib/delay.c b/trunk/arch/s390/lib/delay.c
index 3f5f680726ed..97c1eca83cc2 100644
--- a/trunk/arch/s390/lib/delay.c
+++ b/trunk/arch/s390/lib/delay.c
@@ -36,9 +36,11 @@ static void __udelay_disabled(unsigned long usecs)
 	cr0 = (cr0_saved & 0xffff00e0) | 0x00000800;
 	__ctl_load(cr0 , 0, 0);
 	mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_EXT;
+	lockdep_off();
 	trace_hardirqs_on();
 	__load_psw_mask(mask);
 	local_irq_disable();
+	lockdep_on();
 	__ctl_load(cr0_saved, 0, 0);
 	local_tick_enable(clock_saved);
 	set_clock_comparator(S390_lowcore.clock_comparator);