Merge branch 'akpm' (patches from Andrew Morton)

[sfrench/cifs-2.6.git] / arch / s390 / lib / delay.c

diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index a9f3d0042d58ba849b8c624f23915d88d03d6f70..16dc42d83f9316c8524436457b2a92df59b2fbf0 100644 (file)
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -43,7 +43,7 @@ static void __udelay_disabled(unsigned long long usecs)
        lockdep_off();
        do {
                set_clock_comparator(end);
-               vtime_stop_cpu();
+               enabled_wait();
        } while (get_tod_clock_fast() < end);
        lockdep_on();
        __ctl_load(cr0, 0, 0);
@@ -62,7 +62,7 @@ static void __udelay_enabled(unsigned long long usecs)
                        clock_saved = local_tick_disable();
                        set_clock_comparator(end);
                }
-               vtime_stop_cpu();
+               enabled_wait();
                if (clock_saved)
                        local_tick_enable(clock_saved);
        } while (get_tod_clock_fast() < end);