[gentoo-commits] linux-patches r1378 - genpatches-2.6/trunk/2.6.26

[Daniel Drake (dsd)]

Author: dsd
Date: 2008-11-19 11:07:39 +0000 (Wed, 19 Nov 2008)
New Revision: 1378

Added:
   genpatches-2.6/trunk/2.6.26/2905_clockevents-resume-regression.patch
Modified:
   genpatches-2.6/trunk/2.6.26/0000_README
Log:
Fix clockevents-related resume regression, thanks to Olivier Crete in bug #245927

Modified: genpatches-2.6/trunk/2.6.26/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.26/0000_README	2008-11-17 15:04:33 UTC (rev 1377)
+++ genpatches-2.6/trunk/2.6.26/0000_README	2008-11-19 11:07:39 UTC (rev 1378)
@@ -39,33 +39,33 @@
 Individual Patch Descriptions:
 --------------------------------------------------------------------------
 
-Patch:  1000_linux-2.6.26.1.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.1
+Patch:	1000_linux-2.6.26.1.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.1
 
-Patch:  1001_linux-2.6.26.2.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.2
+Patch:	1001_linux-2.6.26.2.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.2
 
-Patch:  1002_linux-2.6.26.3.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.3
+Patch:	1002_linux-2.6.26.3.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.3
 
-Patch:  1003_linux-2.6.26.4.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.4
+Patch:	1003_linux-2.6.26.4.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.4
 
-Patch:  1004_linux-2.6.26.5.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.5
+Patch:	1004_linux-2.6.26.5.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.5
 
-Patch:  1005_linux-2.6.26.6.patch
-From:   http://www.kernel.org
-Desc:   Linux 2.6.26.6
+Patch:	1005_linux-2.6.26.6.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.26.6
 
-Patch:  1502_wan-sbni_ioctl-add-missing-capability-checks.patch
-From:   http://www.kernel.org
-Desc:   Adds missing capability checks in drivers/net/wan/sbni.c -> sbni_ioctl()
+Patch:	1502_wan-sbni_ioctl-add-missing-capability-checks.patch
+From:	http://www.kernel.org
+Desc:	Adds missing capability checks in drivers/net/wan/sbni.c -> sbni_ioctl()
 
 Patch:	1900_UTC-timestamp-option.patch
 From:	http://bugs.gentoo.org/233307
@@ -79,6 +79,10 @@
 From:	http://www.kernel.org
 Desc:	Makefile patch
 
+Patch:	2905_clockevents-resume-regression.patch
+From:	http://bugs.gentoo.org/245927
+Desc:	Fix clockevents-related resume regression
+
 Patch:	4105_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users

Added: genpatches-2.6/trunk/2.6.26/2905_clockevents-resume-regression.patch
===================================================================
--- genpatches-2.6/trunk/2.6.26/2905_clockevents-resume-regression.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.26/2905_clockevents-resume-regression.patch	2008-11-19 11:07:39 UTC (rev 1378)
@@ -0,0 +1,135 @@
+
+Revert 2 patches to fix https://bugs.gentoo.org/show_bug.cgi?id=245927
+
+From: Thomas Gleixner <tglx@××××××××××.de>
+Date: Sat, 6 Sep 2008 01:01:45 +0000 (+0200)
+Subject: clockevents: broadcast fixup possible waiters
+X-Git-Tag: v2.6.26.6~27
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6-stable.git;a=commitdiff_plain;h=92741d2d653769b582015c6a379e7b46e113435d
+
+clockevents: broadcast fixup possible waiters
+
+commit 7300711e8c6824fcfbd42a126980ff50439d8dd0 upstream
+
+Until the C1E patches arrived there where no users of periodic broadcast
+before switching to oneshot mode. Now we need to trigger a possible
+waiter for a periodic broadcast when switching to oneshot mode.
+Otherwise we can starve them for ever.
+
+
+
+and
+
+
+From: Thomas Gleixner <tglx@××××××××××.de>
+Date: Wed, 3 Sep 2008 21:37:08 +0000 (+0000)
+Subject: clockevents: prevent multiple init/shutdown
+X-Git-Tag: v2.6.26.6~30
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6-stable.git;a=commitdiff_plain;h=7f0a673a75d3f9f50a64f83055b71be67526efd7
+
+clockevents: prevent multiple init/shutdown
+
+commit 9c17bcda991000351cb2373f78be7e4b1c44caa3 upstream
+
+While chasing the C1E/HPET bugreports I went through the clock events
+code inch by inch and found that the broadcast device can be initialized
+and shutdown multiple times. Multiple shutdowns are not critical, but
+useless waste of time. Multiple initializations are simply broken. Another
+CPU might have the device in use already after the first initialization and
+the second init could just render it unusable again.
+
+
+
+
+Index: linux-2.6.26-gentoo-r3/kernel/time/tick-broadcast.c
+===================================================================
+--- linux-2.6.26-gentoo-r3.orig/kernel/time/tick-broadcast.c
++++ linux-2.6.26-gentoo-r3/kernel/time/tick-broadcast.c
+@@ -209,7 +209,7 @@ static void tick_do_broadcast_on_off(voi
+ 	struct clock_event_device *bc, *dev;
+ 	struct tick_device *td;
+ 	unsigned long flags, *reason = why;
+-	int cpu, bc_stopped;
++	int cpu;
+ 
+ 	spin_lock_irqsave(&tick_broadcast_lock, flags);
+ 
+@@ -227,8 +227,6 @@ static void tick_do_broadcast_on_off(voi
+ 	if (!tick_device_is_functional(dev))
+ 		goto out;
+ 
+-	bc_stopped = cpus_empty(tick_broadcast_mask);
+-
+ 	switch (*reason) {
+ 	case CLOCK_EVT_NOTIFY_BROADCAST_ON:
+ 	case CLOCK_EVT_NOTIFY_BROADCAST_FORCE:
+@@ -250,10 +248,9 @@ static void tick_do_broadcast_on_off(voi
+ 		break;
+ 	}
+ 
+-	if (cpus_empty(tick_broadcast_mask)) {
+-		if (!bc_stopped)
+-			clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN);
+-	} else if (bc_stopped) {
++	if (cpus_empty(tick_broadcast_mask))
++		clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN);
++	else {
+ 		if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
+ 			tick_broadcast_start_periodic(bc);
+ 		else
+@@ -490,52 +487,14 @@ static void tick_broadcast_clear_oneshot
+ 	cpu_clear(cpu, tick_broadcast_oneshot_mask);
+ }
+ 
+-static void tick_broadcast_init_next_event(cpumask_t *mask, ktime_t expires)
+-{
+-	struct tick_device *td;
+-	int cpu;
+-
+-	for_each_cpu_mask_nr(cpu, *mask) {
+-		td = &per_cpu(tick_cpu_device, cpu);
+-		if (td->evtdev)
+-			td->evtdev->next_event = expires;
+-	}
+-}
+-
+ /**
+  * tick_broadcast_setup_oneshot - setup the broadcast device
+  */
+ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+ {
+-	/* Set it up only once ! */
+-	if (bc->event_handler != tick_handle_oneshot_broadcast) {
+-		int was_periodic = bc->mode == CLOCK_EVT_MODE_PERIODIC;
+-		int cpu = smp_processor_id();
+-		cpumask_t mask;
+-
+-		bc->event_handler = tick_handle_oneshot_broadcast;
+-		clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+-
+-		/* Take the do_timer update */
+-		tick_do_timer_cpu = cpu;
+-
+-		/*
+-		 * We must be careful here. There might be other CPUs
+-		 * waiting for periodic broadcast. We need to set the
+-		 * oneshot_mask bits for those and program the
+-		 * broadcast device to fire.
+-		 */
+-		mask = tick_broadcast_mask;
+-		cpu_clear(cpu, mask);
+-		cpus_or(tick_broadcast_oneshot_mask,
+-			tick_broadcast_oneshot_mask, mask);
+-
+-		if (was_periodic && !cpus_empty(mask)) {
+-			tick_broadcast_init_next_event(&mask, tick_next_period);
+-			tick_broadcast_set_event(tick_next_period, 1);
+-		} else
+-			bc->next_event.tv64 = KTIME_MAX;
+-	}
++	bc->event_handler = tick_handle_oneshot_broadcast;
++	clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
++	bc->next_event.tv64 = KTIME_MAX;
+ }
+ 
+ /*