| commit | ef7386b5de11f6269eaf072c5ef522d2a43172c2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Dec 30 13:24:40 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Tue Jan 03 10:42:00 2012 -0800 |
| tree | 18626ff19e69fb04b75257a60cd37d51671583de | |
| parent | 6636552f1dd0d2e2be2f87605ea2cd3aa4d2e5b6 [diff] |
Revert "clockevents: Set noop handler in clockevents_exchange_device()" 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>
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 13dfaab..e4c699d 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c
@@ -286,7 +286,6 @@ * 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);