aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/lib
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-21 04:55:00 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-02-21 04:55:00 -0500
commitbf6f6aa46feada857a52cb67d99a7c2fe4a70e87 (patch)
tree930dbd9bcd693cd7f3487fe8072bb0548131ff51 /arch/s390/lib
parent489c80ba8aa9dde8244897cba33a9372c897e531 (diff)
[S390] prevent softirqs if delay is called disabled
The new delay implementation uses the clock comparator and an external interrupt even if it is called disabled for interrupts. To do this all external interrupt source except clock comparator are switched of before enabling external interrupts. The external interrupt at the end of the delay period may not execute softirqs or we can end up in a dead-lock. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/lib')
-rw-r--r--arch/s390/lib/delay.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 02854449b74b..70f2a862b670 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -15,6 +15,7 @@
15#include <linux/delay.h> 15#include <linux/delay.h>
16#include <linux/timex.h> 16#include <linux/timex.h>
17#include <linux/irqflags.h> 17#include <linux/irqflags.h>
18#include <linux/interrupt.h>
18 19
19void __delay(unsigned long loops) 20void __delay(unsigned long loops)
20{ 21{
@@ -35,7 +36,11 @@ void __udelay(unsigned long usecs)
35{ 36{
36 u64 end, time, jiffy_timer = 0; 37 u64 end, time, jiffy_timer = 0;
37 unsigned long flags, cr0, mask, dummy; 38 unsigned long flags, cr0, mask, dummy;
39 int irq_context;
38 40
41 irq_context = in_interrupt();
42 if (!irq_context)
43 local_bh_disable();
39 local_irq_save(flags); 44 local_irq_save(flags);
40 if (raw_irqs_disabled_flags(flags)) { 45 if (raw_irqs_disabled_flags(flags)) {
41 jiffy_timer = S390_lowcore.jiffy_timer; 46 jiffy_timer = S390_lowcore.jiffy_timer;
@@ -62,6 +67,8 @@ void __udelay(unsigned long usecs)
62 __ctl_load(cr0, 0, 0); 67 __ctl_load(cr0, 0, 0);
63 S390_lowcore.jiffy_timer = jiffy_timer; 68 S390_lowcore.jiffy_timer = jiffy_timer;
64 } 69 }
70 if (!irq_context)
71 _local_bh_enable();
65 set_clock_comparator(S390_lowcore.jiffy_timer); 72 set_clock_comparator(S390_lowcore.jiffy_timer);
66 local_irq_restore(flags); 73 local_irq_restore(flags);
67} 74}