[kernel] r15094 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Feb 1 23:40:54 UTC 2010
Author: benh
Date: Mon Feb 1 23:40:51 2010
New Revision: 15094
Log:
clocksource/events: Fix fallout of generic code changes (Closes: #568030)
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/7
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Feb 1 22:54:12 2010 (r15093)
+++ dists/trunk/linux-2.6/debian/changelog Mon Feb 1 23:40:51 2010 (r15094)
@@ -5,6 +5,8 @@
[ Ben Hutchings ]
* [sparc] ftrace: Fix build-time architecture detection (Closes: #568025)
+ * clocksource/events: Fix fallout of generic code changes
+ (Closes: #568030)
-- maximilian attems <maks at debian.org> Mon, 01 Feb 2010 17:16:31 +0100
Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch Mon Feb 1 23:40:51 2010 (r15094)
@@ -0,0 +1,59 @@
+From a362c638bdf052bf424bce7645d39b101090f6ba Mon Sep 17 00:00:00 2001
+From: Thomas Gleixner <tglx at linutronix.de>
+Date: Sat, 14 Nov 2009 00:26:34 +0100
+Subject: [PATCH] clocksource/events: Fix fallout of generic code changes
+
+powerpc grew a new warning due to the type change of clockevent->mult.
+
+The architectures which use parts of the generic time keeping
+infrastructure tripped over my wrong assumption that
+clocksource_register is only used when GENERIC_TIME=y.
+
+I should have looked and also I should have known better. These
+renitent Gaul villages are racking my nerves. Some serious deprecating
+is due.
+
+Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
+---
+ arch/powerpc/kernel/time.c | 2 +-
+ kernel/time/clocksource.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
+index 92dc844..60ceb27 100644
+--- a/arch/powerpc/kernel/time.c
++++ b/arch/powerpc/kernel/time.c
+@@ -905,7 +905,7 @@ static void register_decrementer_clockevent(int cpu)
+ *dec = decrementer_clockevent;
+ dec->cpumask = cpumask_of(cpu);
+
+- printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
++ printk(KERN_DEBUG "clockevent: %s mult[%x] shift[%d] cpu[%d]\n",
+ dec->name, dec->mult, dec->shift, cpu);
+
+ clockevents_register_device(dec);
+diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c
+index b65b242..72a2dcb 100644
+--- 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
+ *
+--
+1.6.6
+
Modified: dists/trunk/linux-2.6/debian/patches/series/7
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/7 Mon Feb 1 22:54:12 2010 (r15093)
+++ dists/trunk/linux-2.6/debian/patches/series/7 Mon Feb 1 23:40:51 2010 (r15094)
@@ -1 +1,2 @@
+ bugfix/all/ftrace-Use-UTS_MACHINE-not-ARCH-and-word-size-in-recordmcount.patch
++ bugfix/all/clocksource-events-Fix-fallout-of-generic-code-changes.patch
More information about the Kernel-svn-changes
mailing list