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 eae21a8ac72de5f86cc3ae2a1138960381975c76..fc6ab6094df811c4511b37ceb7d9783170d98e5a 100644 (file)
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -43,7 +43,7 @@ void __udelay(unsigned long usecs)
                local_bh_disable();
        local_irq_save(flags);
        if (raw_irqs_disabled_flags(flags)) {
-               old_cc = S390_lowcore.clock_comparator;
+               old_cc = local_tick_disable();
                S390_lowcore.clock_comparator = -1ULL;
                __ctl_store(cr0, 0, 0);
                dummy = (cr0 & 0xffff00e0) | 0x00000800;
@@ -65,7 +65,7 @@ void __udelay(unsigned long usecs)
 
        if (raw_irqs_disabled_flags(flags)) {
                __ctl_load(cr0, 0, 0);
-               S390_lowcore.clock_comparator = old_cc;
+               local_tick_enable(old_cc);
        }
        if (!irq_context)
                _local_bh_enable();