Merge branch 'core/locking' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / s390 / lib / delay.c

diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 70f2a862b670649e296d1c6e5277f01241161a11..fc6ab6094df811c4511b37ceb7d9783170d98e5a 100644 (file)
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -34,7 +34,7 @@ void __delay(unsigned long loops)
  */
 void __udelay(unsigned long usecs)
 {
-       u64 end, time, jiffy_timer = 0;
+       u64 end, time, old_cc = 0;
        unsigned long flags, cr0, mask, dummy;
        int irq_context;
 
@@ -43,8 +43,8 @@ void __udelay(unsigned long usecs)
                local_bh_disable();
        local_irq_save(flags);
        if (raw_irqs_disabled_flags(flags)) {
-               jiffy_timer = S390_lowcore.jiffy_timer;
-               S390_lowcore.jiffy_timer = -1ULL - (4096 << 12);
+               old_cc = local_tick_disable();
+               S390_lowcore.clock_comparator = -1ULL;
                __ctl_store(cr0, 0, 0);
                dummy = (cr0 & 0xffff00e0) | 0x00000800;
                __ctl_load(dummy , 0, 0);
@@ -55,8 +55,8 @@ void __udelay(unsigned long usecs)
 
        end = get_clock() + ((u64) usecs << 12);
        do {
-               time = end < S390_lowcore.jiffy_timer ?
-                       end : S390_lowcore.jiffy_timer;
+               time = end < S390_lowcore.clock_comparator ?
+                       end : S390_lowcore.clock_comparator;
                set_clock_comparator(time);
                trace_hardirqs_on();
                __load_psw_mask(mask);
@@ -65,10 +65,10 @@ void __udelay(unsigned long usecs)
 
        if (raw_irqs_disabled_flags(flags)) {
                __ctl_load(cr0, 0, 0);
-               S390_lowcore.jiffy_timer = jiffy_timer;
+               local_tick_enable(old_cc);
        }
        if (!irq_context)
                _local_bh_enable();
-       set_clock_comparator(S390_lowcore.jiffy_timer);
+       set_clock_comparator(S390_lowcore.clock_comparator);
        local_irq_restore(flags);
 }