2 files changed, 5 insertions, 0 deletions

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 6e23fde83dbe..61d00a8cdf2f 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -66,6 +66,8 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc)
  */
 int tick_check_broadcast_device(struct clock_event_device *dev)
 {
+        struct clock_event_device *cur = tick_broadcast_device.evtdev;
+
         if ((dev->features & CLOCK_EVT_FEAT_DUMMY) ||
             (tick_broadcast_device.evtdev &&
              tick_broadcast_device.evtdev->rating >= dev->rating) ||
@@ -73,6 +75,8 @@ int tick_check_broadcast_device(struct clock_event_device *dev)
                 return 0;
 
         clockevents_exchange_device(tick_broadcast_device.evtdev, dev);
+        if (cur)
+                cur->event_handler = clockevents_handle_noop;
         tick_broadcast_device.evtdev = dev;
         if (!cpumask_empty(tick_broadcast_mask))
                 tick_broadcast_start_periodic(dev);
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 74413e396acc..6176a3e45709 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -323,6 +323,7 @@ static void tick_shutdown(unsigned int *cpup)
                  */
                 dev->mode = CLOCK_EVT_MODE_UNUSED;
                 clockevents_exchange_device(dev, NULL);
+                dev->event_handler = clockevents_handle_noop;
                 td->evtdev = NULL;
         }
         raw_spin_unlock_irqrestore(&tick_device_lock, flags);