diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-08 10:22:40 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-08 10:24:25 -0500 |
| commit | 9019b9a4caeae0d96018a115a473ba752701133e (patch) | |
| tree | af5f9646ba5aa7cb709f4b7d85bfd55c3f296b6f | |
| parent | d92e38357dce9d6d3b39978ff22d9728dc0fd3c1 (diff) | |
| download | longterm-queue-2.6.34-9019b9a4caeae0d96018a115a473ba752701133e.tar.gz | |
drop clockevents noop patch
See upstream 3b87487ac5008072f138953b07505a7e3493327f
-----------
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri Dec 30 13:24:40 2011 -0800
Revert "clockevents: Set noop handler in clockevents_exchange_device()"
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>
Cc: Greg KH <gregkh@suse.de>
Cc: stable@kernel.org # for stable kernels that applied the original
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-----------
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/clockevents-Set-noop-handler-in-clockevents_exchange.patch | 34 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/queue/clockevents-Set-noop-handler-in-clockevents_exchange.patch b/queue/clockevents-Set-noop-handler-in-clockevents_exchange.patch deleted file mode 100644 index bff91f3..0000000 --- a/queue/clockevents-Set-noop-handler-in-clockevents_exchange.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 21e81c72d4918e25010b46086e2b5e9adb72a1a7 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner <tglx@linutronix.de> -Date: Fri, 2 Dec 2011 16:02:45 +0100 -Subject: [PATCH 24/24] clockevents: Set noop handler in - clockevents_exchange_device() - -commit de28f25e8244c7353abed8de0c7792f5f883588c upstream. - -If a device is shutdown, then there might be a pending interrupt, -which will be processed after we reenable interrupts, which causes the -original handler to be run. If the old handler is the (broadcast) -periodic handler the shutdown state might hang the kernel completely. - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - kernel/time/clockevents.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c -index d7395fd..8198b5b 100644 ---- a/kernel/time/clockevents.c -+++ b/kernel/time/clockevents.c -@@ -220,6 +220,7 @@ void clockevents_exchange_device(struct clock_event_device *old, - * 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); --- -1.7.12.1 - diff --git a/queue/series b/queue/series index 85b5970..b358273 100644 --- a/queue/series +++ b/queue/series @@ -42,7 +42,6 @@ x86-mpparse-Account-for-bus-types-other-than-ISA-and.patch oprofile-x86-Fix-crash-when-unloading-module-nmi-tim.patch genirq-Fix-race-condition-when-stopping-the-irq-thre.patch tick-broadcast-Stop-active-broadcast-device-when-rep.patch -clockevents-Set-noop-handler-in-clockevents_exchange.patch # from .51 ALSA-sis7019-give-slow-codecs-more-time-to-reset.patch |