diff options
Diffstat (limited to 'arch/s390/lib')
| -rw-r--r-- | arch/s390/lib/delay.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c index 57c87d7d7ede..a9f3d0042d58 100644 --- a/arch/s390/lib/delay.c +++ b/arch/s390/lib/delay.c | |||
| @@ -44,7 +44,7 @@ static void __udelay_disabled(unsigned long long usecs) | |||
| 44 | do { | 44 | do { |
| 45 | set_clock_comparator(end); | 45 | set_clock_comparator(end); |
| 46 | vtime_stop_cpu(); | 46 | vtime_stop_cpu(); |
| 47 | } while (get_tod_clock() < end); | 47 | } while (get_tod_clock_fast() < end); |
| 48 | lockdep_on(); | 48 | lockdep_on(); |
| 49 | __ctl_load(cr0, 0, 0); | 49 | __ctl_load(cr0, 0, 0); |
| 50 | __ctl_load(cr6, 6, 6); | 50 | __ctl_load(cr6, 6, 6); |
| @@ -55,7 +55,7 @@ static void __udelay_enabled(unsigned long long usecs) | |||
| 55 | { | 55 | { |
| 56 | u64 clock_saved, end; | 56 | u64 clock_saved, end; |
| 57 | 57 | ||
| 58 | end = get_tod_clock() + (usecs << 12); | 58 | end = get_tod_clock_fast() + (usecs << 12); |
| 59 | do { | 59 | do { |
| 60 | clock_saved = 0; | 60 | clock_saved = 0; |
| 61 | if (end < S390_lowcore.clock_comparator) { | 61 | if (end < S390_lowcore.clock_comparator) { |
| @@ -65,7 +65,7 @@ static void __udelay_enabled(unsigned long long usecs) | |||
| 65 | vtime_stop_cpu(); | 65 | vtime_stop_cpu(); |
| 66 | if (clock_saved) | 66 | if (clock_saved) |
| 67 | local_tick_enable(clock_saved); | 67 | local_tick_enable(clock_saved); |
| 68 | } while (get_tod_clock() < end); | 68 | } while (get_tod_clock_fast() < end); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | /* | 71 | /* |
| @@ -109,8 +109,8 @@ void udelay_simple(unsigned long long usecs) | |||
| 109 | { | 109 | { |
| 110 | u64 end; | 110 | u64 end; |
| 111 | 111 | ||
| 112 | end = get_tod_clock() + (usecs << 12); | 112 | end = get_tod_clock_fast() + (usecs << 12); |
| 113 | while (get_tod_clock() < end) | 113 | while (get_tod_clock_fast() < end) |
| 114 | cpu_relax(); | 114 | cpu_relax(); |
| 115 | } | 115 | } |
| 116 | 116 | ||
| @@ -120,10 +120,10 @@ void __ndelay(unsigned long long nsecs) | |||
| 120 | 120 | ||
| 121 | nsecs <<= 9; | 121 | nsecs <<= 9; |
| 122 | do_div(nsecs, 125); | 122 | do_div(nsecs, 125); |
| 123 | end = get_tod_clock() + nsecs; | 123 | end = get_tod_clock_fast() + nsecs; |
| 124 | if (nsecs & ~0xfffUL) | 124 | if (nsecs & ~0xfffUL) |
| 125 | __udelay(nsecs >> 12); | 125 | __udelay(nsecs >> 12); |
| 126 | while (get_tod_clock() < end) | 126 | while (get_tod_clock_fast() < end) |
| 127 | barrier(); | 127 | barrier(); |
| 128 | } | 128 | } |
| 129 | EXPORT_SYMBOL(__ndelay); | 129 | EXPORT_SYMBOL(__ndelay); |
