From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 3 Jan 2012 17:35:41 +0000 (-0800)
Subject: 3.0 patches
X-Git-Tag: v3.0.15~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=793570c8c9b147e17436b6657a887b86d1207c1a;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0 patches

added patches:
	revert-clockevents-set-noop-handler-in-clockevents_exchange_device.patch
---

diff --git a/queue-3.0/revert-clockevents-set-noop-handler-in-clockevents_exchange_device.patch b/queue-3.0/revert-clockevents-set-noop-handler-in-clockevents_exchange_device.patch
new file mode 100644
index 00000000000..4367a706297
--- /dev/null
+++ b/queue-3.0/revert-clockevents-set-noop-handler-in-clockevents_exchange_device.patch
@@ -0,0 +1,47 @@
+From 3b87487ac5008072f138953b07505a7e3493327f Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Fri, 30 Dec 2011 13:24:40 -0800
+Subject: Revert "clockevents: Set noop handler in clockevents_exchange_device()"
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 3b87487ac5008072f138953b07505a7e3493327f upstream.
+
+This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.
+
+It results in resume problems for various people. See for example
+
+  http://thread.gmane.org/gmane.linux.kernel/1233033
+  http://thread.gmane.org/gmane.linux.kernel/1233389
+  http://thread.gmane.org/gmane.linux.kernel/1233159
+  http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877
+
+and the fedora and ubuntu bug reports
+
+  https://bugzilla.redhat.com/show_bug.cgi?id=767248
+  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569
+
+which got bisected down to the stable version of this commit.
+
+Reported-by: Jonathan Nieder <jrnieder@gmail.com>
+Reported-by: Phil Miller <mille121@illinois.edu>
+Reported-by: Philip Langdale <philipl@overt.org>
+Reported-by: Tim Gardner <tim.gardner@canonical.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/time/clockevents.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/kernel/time/clockevents.c
++++ b/kernel/time/clockevents.c
+@@ -286,7 +286,6 @@ void clockevents_exchange_device(struct
+ 	 * released list and do a notify add later.
+ 	 */
+ 	if (old) {
+-		old->event_handler = clockevents_handle_noop;
+ 		clockevents_set_mode(old, CLOCK_EVT_MODE_UNUSED);
+ 		list_del(&old->list);
+ 		list_add(&old->list, &clockevents_released);
diff --git a/queue-3.0/series b/queue-3.0/series
index 94dbd5c9408..08d351aef43 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -29,3 +29,4 @@ ath9k-fix-max-phy-rate-at-rate-control-init.patch
 iwlwifi-do-not-set-the-sequence-control-bit-is-not-needed.patch
 iwlwifi-allow-to-switch-to-ht40-if-not-associated.patch
 memcg-keep-root-group-unchanged-if-creation-fails.patch
+revert-clockevents-set-noop-handler-in-clockevents_exchange_device.patch