diff options
| author | Alok N Kataria <akataria@vmware.com> | 2009-02-18 12:33:55 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 07:53:08 +0100 |
| commit | 48ffc70b675aa7798a52a2e92e20f6cce9140b3d (patch) | |
| tree | fe920201caf48cb2c100cd429a2803f70cc45368 /arch | |
| parent | 402a917aca5daca69fcc91f43e6f1e6939cf393b (diff) | |
| download | op-kernel-dev-48ffc70b675aa7798a52a2e92e20f6cce9140b3d.zip op-kernel-dev-48ffc70b675aa7798a52a2e92e20f6cce9140b3d.tar.gz | |
x86, vmi: TSC going backwards check in vmi clocksource
Impact: fix time warps under vmware
Similar to the check for TSC going backwards in the TSC clocksource,
we also need this check for VMI clocksource.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: stable@kernel.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/vmiclock_32.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index c4c1f9e..bde106c 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c @@ -283,10 +283,13 @@ void __devinit vmi_time_ap_init(void) #endif /** vmi clocksource */ +static struct clocksource clocksource_vmi; static cycle_t read_real_cycles(void) { - return vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL); + cycle_t ret = (cycle_t)vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL); + return ret >= clocksource_vmi.cycle_last ? + ret : clocksource_vmi.cycle_last; } static struct clocksource clocksource_vmi = { |
