1 files changed, 6 insertions, 9 deletions

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 0962e0577660..298bc7c6f09f 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -64,8 +64,9 @@ static void tick_broadcast_start_periodic(struct clock_event_device *bc)
  */
 int tick_check_broadcast_device(struct clock_event_device *dev)
 {
-        if (tick_broadcast_device.evtdev ||
-            (dev->features & CLOCK_EVT_FEAT_C3STOP))
+        if ((tick_broadcast_device.evtdev &&
+             tick_broadcast_device.evtdev->rating >= dev->rating) ||
+             (dev->features & CLOCK_EVT_FEAT_C3STOP))
                 return 0;
 
         clockevents_exchange_device(NULL, dev);
@@ -176,8 +177,6 @@ static void tick_do_periodic_broadcast(void)
  */
 static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
 {
-        dev->next_event.tv64 = KTIME_MAX;
-
         tick_do_periodic_broadcast();
 
         /*
@@ -515,11 +514,9 @@ static void tick_broadcast_clear_oneshot(int cpu)
  */
 void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
 {
-        if (bc->mode != CLOCK_EVT_MODE_ONESHOT) {
-                bc->event_handler = tick_handle_oneshot_broadcast;
-                clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
-                bc->next_event.tv64 = KTIME_MAX;
-        }
+        bc->event_handler = tick_handle_oneshot_broadcast;
+        clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+        bc->next_event.tv64 = KTIME_MAX;
 }
 
 /*