Merge branch 'x86/urgent' into x86/core

2009-02-20 17:40:43 +01:00
parent 9be1b56a3e 07a66d7c53
commit 3b6f7b9beb
218 changed files with 2070 additions and 903 deletions
--- 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 = {