diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/vmiclock_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index 9cd28c04952a..b77ad5789af9 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c | |||
@@ -288,8 +288,7 @@ static struct clocksource clocksource_vmi; | |||
288 | static cycle_t read_real_cycles(void) | 288 | static cycle_t read_real_cycles(void) |
289 | { | 289 | { |
290 | cycle_t ret = (cycle_t)vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL); | 290 | cycle_t ret = (cycle_t)vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL); |
291 | return ret >= clocksource_vmi.cycle_last ? | 291 | return max(ret, clocksource_vmi.cycle_last); |
292 | ret : clocksource_vmi.cycle_last; | ||
293 | } | 292 | } |
294 | 293 | ||
295 | static struct clocksource clocksource_vmi = { | 294 | static struct clocksource clocksource_vmi = { |