Commit 545b288d authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] time: let local_tick_enable/disable() reprogram the clock comparator

Let local_tick_enable/disable() reprogram the clock comparator so the
function names make semantically more sense.
Also that way the functions are more symmetric since normally each
local_tick_enable() call usually would have a subsequent call to
set_clock_comparator() anyway.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 17eb7a5c
...@@ -59,12 +59,14 @@ static inline unsigned long long local_tick_disable(void) ...@@ -59,12 +59,14 @@ static inline unsigned long long local_tick_disable(void)
old = S390_lowcore.clock_comparator; old = S390_lowcore.clock_comparator;
S390_lowcore.clock_comparator = -1ULL; S390_lowcore.clock_comparator = -1ULL;
set_clock_comparator(S390_lowcore.clock_comparator);
return old; return old;
} }
static inline void local_tick_enable(unsigned long long comp) static inline void local_tick_enable(unsigned long long comp)
{ {
S390_lowcore.clock_comparator = comp; S390_lowcore.clock_comparator = comp;
set_clock_comparator(S390_lowcore.clock_comparator);
} }
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
......
...@@ -47,7 +47,6 @@ static void __udelay_disabled(unsigned long long usecs) ...@@ -47,7 +47,6 @@ static void __udelay_disabled(unsigned long long usecs)
lockdep_on(); lockdep_on();
__ctl_load(cr0_saved, 0, 0); __ctl_load(cr0_saved, 0, 0);
local_tick_enable(clock_saved); local_tick_enable(clock_saved);
set_clock_comparator(S390_lowcore.clock_comparator);
} }
static void __udelay_enabled(unsigned long long usecs) static void __udelay_enabled(unsigned long long usecs)
...@@ -70,7 +69,6 @@ static void __udelay_enabled(unsigned long long usecs) ...@@ -70,7 +69,6 @@ static void __udelay_enabled(unsigned long long usecs)
if (clock_saved) if (clock_saved)
local_tick_enable(clock_saved); local_tick_enable(clock_saved);
} while (get_clock() < end); } while (get_clock() < end);
set_clock_comparator(S390_lowcore.clock_comparator);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment