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

[Maximilian Attems]

Author: maks
Date: Tue Sep  9 14:36:14 2008
New Revision: 12207

Log:
Revert "Revert r12205."

This reverts commit 2d4a76b5eaae30d2e5aa4d240652a8db6c2e5a27.

repeating for the deaf:
if you revert, tell *before* on ml why.

the needed abi change is known and doesn't matter for parisc.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/rtc-class-regression-parisc.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Sep  9 14:36:14 2008
@@ -57,6 +57,7 @@
 
   [ maximilian attems ]
   * openvz: Add upstream fixes up to 24cebf40278cb071ff8b. (closes: #497528)
+  * [hppa]: Fix RTC_CLASS regression with PARISC.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Fri, 29 Aug 2008 16:02:27 +0300
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/rtc-class-regression-parisc.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/rtc-class-regression-parisc.patch	Tue Sep  9 14:36:14 2008
@@ -0,0 +1,41 @@
+As of 2.6.26, most distribution kernels for PARISC are coming with the
+wrong RTC infrastructure enabled, meaning that userland can no longer
+get at the RTC, so all our parisc clocks are drifting.
+
+The fault is this patch:
+
+commit c750090085f260503d8beec1c73c4d2e4fe93628
+Author: David Brownell <david-b at pacbell.net>
+Date:   Mon Apr 28 02:11:52 2008 -0700
+
+    rtc: avoid legacy drivers with generic framework
+
+Which makes drivers/rtc take precedence over the generic rtc.  However,
+for parisc we only have the generic rtc, so in essence this turns off
+our ability to access the rtc.  Put it back again by making RTC_CLASS
+unselectable if the architecture is parisc.
+
+Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
+
+---
+
+diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
+index 9a9755c..472fb19 100644
+--- a/drivers/rtc/Kconfig
++++ b/drivers/rtc/Kconfig
+@@ -8,7 +8,7 @@ config RTC_LIB
+ menuconfig RTC_CLASS
+ 	tristate "Real Time Clock"
+ 	default n
+-	depends on !S390
++	depends on !(S390 || PARISC)
+ 	select RTC_LIB
+ 	help
+ 	  Generic RTC class support. If you say yes here, you will
+
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+Please read the FAQ at  http://www.tux.org/lkml/
\ No newline at end of file

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(original)
+++ dists/sid/linux-2.6/debian/patches/series/5	Tue Sep  9 14:36:14 2008
@@ -4,3 +4,4 @@
 - bugfix/sctp-auth-key-length-check.patch
 - bugfix/sctp-auth-panics.patch
 + bugfix/all/stable/2.6.26.4.patch
++ bugfix/all/rtc-class-regression-parisc.patch