[kernel] r15244 - in dists/lenny/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Moritz Muehlenhoff]

Author: jmm
Date: Sat Feb 20 09:32:36 2010
New Revision: 15244

Log:
fix vmi clocksource

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/x86/fix-vmi-clocksource.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/22

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Feb 20 05:29:13 2010	(r15243)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Feb 20 09:32:36 2010	(r15244)
@@ -9,7 +9,8 @@
 
   [ Moritz Muehlenhoff ]
   * Fix deadlock in saa7134-empress driver (Closes: #499671)
-	
+  * x86, vmi: TSC going backwards check in vmi clocksource (Closes: #524521)
+
   [ Ben Hutchings ]
   * via-velocity: Give RX descriptors to the NIC later on open or MTU change
     (Closes: #508527)

Added: dists/lenny/linux-2.6/debian/patches/bugfix/x86/fix-vmi-clocksource.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/x86/fix-vmi-clocksource.patch	Sat Feb 20 09:32:36 2010	(r15244)
@@ -0,0 +1,40 @@
+From 48ffc70b675aa7798a52a2e92e20f6cce9140b3d Mon Sep 17 00:00:00 2001
+From: Alok N Kataria <akataria at vmware.com>
+Date: Wed, 18 Feb 2009 12:33:55 -0800
+Subject: [PATCH] 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 at vmware.com>
+Cc: Zachary Amsden <zach at vmware.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+Cc: stable at kernel.org
+---
+ 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 = {
+-- 
+1.7.0
+

Modified: dists/lenny/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/22	Sat Feb 20 05:29:13 2010	(r15243)
+++ dists/lenny/linux-2.6/debian/patches/series/22	Sat Feb 20 09:32:36 2010	(r15244)
@@ -19,3 +19,5 @@
 + features/all/megaraid_sas-add-new-controllers-0x78-0x79.patch
 + bugfix/all/saa7134-fix-deadlock.patch
 + features/all/add-be2net.patch
++ bugfix/x86/fix-vmi-clocksource.patch
+