[kernel] r19780 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Jan 27 18:50:13 2013
New Revision: 19780

Log:
Revert "time: Avoid making adjustments if we haven't accumulated anything"
(Closes: #699112, regression in 2.6.32.60)

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-time-avoid-making-adjustments-if-we-haven-t.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/48

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sun Jan 27 02:18:49 2013	(r19779)
+++ dists/squeeze/linux-2.6/debian/changelog	Sun Jan 27 18:50:13 2013	(r19780)
@@ -2,6 +2,8 @@
 
   [ Ben Hutchings ]
   * [s390] s390/time: fix sched_clock() overflow (Closes: #698382) 
+  * Revert "time: Avoid making adjustments if we haven't accumulated
+    anything" (Closes: #699112, regression in 2.6.32.60)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 19 Jan 2013 19:57:27 +0000
 

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-time-avoid-making-adjustments-if-we-haven-t.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/revert-time-avoid-making-adjustments-if-we-haven-t.patch	Sun Jan 27 18:50:13 2013	(r19780)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: Revert "time: Avoid making adjustments if we haven't accumulated
+ anything"
+Date: Sun, 27 Jan 2013 18:42:52 +0000
+Bug-Debian: http://bugs.debian.org/699112
+
+This reverts commit 61b76840ddee647c0c223365378c3f394355b7d7
+(upstream commit bf2ac312195155511a0f79325515cbb61929898a).
+
+In 2.6.32 we still need to update xtime_cache regularly.  The
+optimisation of update_wall_time() breaks that, causing some programs
+to run slowly.
+
+---
+--- a/kernel/time/timekeeping.c
++++ b/kernel/time/timekeeping.c
+@@ -807,10 +807,6 @@ void update_wall_time(void)
+ #else
+ 	offset = timekeeper.cycle_interval;
+ #endif
+-	/* Check if there's really nothing to do */
+-	if (offset < timekeeper.cycle_interval)
+-		return;
+-
+ 	timekeeper.xtime_nsec = (s64)xtime.tv_nsec << timekeeper.shift;
+ 
+ 	/* normally this loop will run just once, however in the

Modified: dists/squeeze/linux-2.6/debian/patches/series/48
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/48	Sun Jan 27 02:18:49 2013	(r19779)
+++ dists/squeeze/linux-2.6/debian/patches/series/48	Sun Jan 27 18:50:13 2013	(r19780)
@@ -1 +1,2 @@
 + bugfix/s390/s390-time-fix-sched_clock-overflow.patch
++ bugfix/all/revert-time-avoid-making-adjustments-if-we-haven-t.patch