Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48ffc70b authored by Alok N Kataria's avatar Alok N Kataria Committed by Ingo Molnar
Browse files

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: default avatarAlok N Kataria <akataria@vmware.com>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: stable@kernel.org
parent 402a917a

arch/x86/kernel/vmiclock_32.c

+4 −1
Original line number Diff line number Diff line
@@ -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 = {