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

[Ben Hutchings]

Author: benh
Date: Thu Feb  4 21:08:38 2010
New Revision: 15122

Log:
Revert incorrect change to powerpc clocksource setup

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-always-define-clocksource_max_deferment.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/8

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Feb  4 19:34:02 2010	(r15121)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Feb  4 21:08:38 2010	(r15122)
@@ -9,6 +9,7 @@
   
   [ Ben Hutchings ]
   * Build lgs8gxx driver along with cxusb (Closes: #568414)
+  * Revert incorrect change to powerpc clocksource setup
 
  -- Bastian Blank <waldi at debian.org>  Thu, 04 Feb 2010 12:08:47 +0100
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-always-define-clocksource_max_deferment.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-always-define-clocksource_max_deferment.patch	Thu Feb  4 21:08:38 2010	(r15122)
@@ -0,0 +1,20 @@
+--- a/kernel/time/clocksource.c
++++ b/kernel/time/clocksource.c
+@@ -466,8 +466,6 @@ void clocksource_touch_watchdog(void)
+ 	clocksource_resume_watchdog();
+ }
+ 
+-#ifdef CONFIG_GENERIC_TIME
+-
+ /**
+  * clocksource_max_deferment - Returns max time the clocksource can be deferred
+  * @cs:         Pointer to clocksource
+@@ -509,6 +507,8 @@ static u64 clocksource_max_deferment(struct clocksource *cs)
+ 	return max_nsecs - (max_nsecs >> 5);
+ }
+ 
++#ifdef CONFIG_GENERIC_TIME
++
+ /**
+  * clocksource_select - Select the best clocksource available
+  *

Modified: dists/trunk/linux-2.6/debian/patches/series/8
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/8	Thu Feb  4 19:34:02 2010	(r15121)
+++ dists/trunk/linux-2.6/debian/patches/series/8	Thu Feb  4 21:08:38 2010	(r15122)
@@ -2,3 +2,5 @@
 + bugfix/powerpc/powerpc-tif_abi_pending-bit-removal.patch
 + bugfix/sparc/sparc-tif_abi_pending-bit-removal.patch
 + bugfix/all/cxusb-select-lgs8gxx.patch
+- bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
++ bugfix/all/clocksource-always-define-clocksource_max_deferment.patch