From 161239f4c93b8275dcffd3f0893de88e9fa22ab3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 2 Dec 2011 16:02:45 +0100
Subject: [PATCH] --- yaml --- r: 276378 b: refs/heads/master c:
 de28f25e8244c7353abed8de0c7792f5f883588c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/time/clockevents.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7e354be92da..617252d70cc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1be84309c58b1e7c6d626e28fba41a22b364c3d
+refs/heads/master: de28f25e8244c7353abed8de0c7792f5f883588c
diff --git a/trunk/kernel/time/clockevents.c b/trunk/kernel/time/clockevents.c
index 1ecd6ba36d6c..c4eb71c8b2ea 100644
--- a/trunk/kernel/time/clockevents.c
+++ b/trunk/kernel/time/clockevents.c
@@ -387,6 +387,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);