3 files changed, 19 insertions, 8 deletions

diff --git a/include/linux/tick.h b/include/linux/tick.h
index 589868b09aff..f9ff225d53c0 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -36,6 +36,12 @@ extern void tick_irq_enter(void);
 static inline void tick_irq_enter(void) { }
 #endif
 
+#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT)
+extern void hotplug_cpu__broadcast_tick_pull(int dead_cpu);
+#else
+static inline void hotplug_cpu__broadcast_tick_pull(int dead_cpu) { }
+#endif
+
 #ifdef CONFIG_NO_HZ_COMMON
 extern int tick_nohz_tick_stopped(void);
 extern void tick_nohz_idle_enter(void);
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 1972b161c61e..af5db20e5803 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -20,6 +20,7 @@
 #include <linux/gfp.h>
 #include <linux/suspend.h>
 #include <linux/lockdep.h>
+#include <linux/tick.h>
 #include <trace/events/power.h>
 
 #include "smpboot.h"
@@ -411,6 +412,7 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
         while (!idle_cpu(cpu))
                 cpu_relax();
 
+        hotplug_cpu__broadcast_tick_pull(cpu);
         /* This actually kills the CPU. */
         __cpu_die(cpu);
 
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 19cfb381faa9..f5e0fd5652dc 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -680,14 +680,19 @@ static void broadcast_shutdown_local(struct clock_event_device *bc,
         clockevents_set_state(dev, CLOCK_EVT_STATE_SHUTDOWN);
 }
 
-static void broadcast_move_bc(int deadcpu)
+void hotplug_cpu__broadcast_tick_pull(int deadcpu)
 {
-        struct clock_event_device *bc = tick_broadcast_device.evtdev;
+        struct clock_event_device *bc;
+        unsigned long flags;
 
-        if (!bc || !broadcast_needs_cpu(bc, deadcpu))
-                return;
-        /* This moves the broadcast assignment to this cpu */
-        clockevents_program_event(bc, bc->next_event, 1);
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
+        bc = tick_broadcast_device.evtdev;
+
+        if (bc && broadcast_needs_cpu(bc, deadcpu)) {
+                /* This moves the broadcast assignment to this CPU: */
+                clockevents_program_event(bc, bc->next_event, 1);
+        }
+        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
 /*
@@ -924,8 +929,6 @@ void tick_shutdown_broadcast_oneshot(unsigned int *cpup)
         cpumask_clear_cpu(cpu, tick_broadcast_pending_mask);
         cpumask_clear_cpu(cpu, tick_broadcast_force_mask);
 
-        broadcast_move_bc(cpu);
-
         raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }