path: root/kernel
diff options
authorLinus Torvalds <>2011-12-30 13:24:40 -0800
committerGreg Kroah-Hartman <>2012-01-03 10:11:29 -0800
commit664ba1f0d41f8e593f4189b5cdeebc860be25b8f (patch)
tree84f8ab0e4764f5871cfbd240a5848fd76ad823b2 /kernel
parentc26f60b69ab33168db3b6b1ca383c39d5f6452b3 (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 and the fedora and ubuntu bug reports which got bisected down to the stable version of this commit. Reported-by: Jonathan Nieder <> Reported-by: Phil Miller <> Reported-by: Philip Langdale <> Reported-by: Tim Gardner <> Cc: Thomas Gleixner <> Signed-off-by: Linus Torvalds <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'kernel')
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 13dfaaba4061..e4c699dfa4e8 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -286,7 +286,6 @@ 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_add(&old->list, &clockevents_released);