diff options
-rw-r--r-- | kernel/hrtimer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b741f850426e..bda9cb924276 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1571,7 +1571,7 @@ static void tickle_timers(void *arg) | |||
1571 | static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, | 1571 | static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, |
1572 | unsigned long action, void *hcpu) | 1572 | unsigned long action, void *hcpu) |
1573 | { | 1573 | { |
1574 | int dcpu, scpu = (long)hcpu; | 1574 | int scpu = (long)hcpu; |
1575 | 1575 | ||
1576 | switch (action) { | 1576 | switch (action) { |
1577 | 1577 | ||
@@ -1583,10 +1583,14 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, | |||
1583 | #ifdef CONFIG_HOTPLUG_CPU | 1583 | #ifdef CONFIG_HOTPLUG_CPU |
1584 | case CPU_DEAD: | 1584 | case CPU_DEAD: |
1585 | case CPU_DEAD_FROZEN: | 1585 | case CPU_DEAD_FROZEN: |
1586 | { | ||
1587 | int dcpu; | ||
1588 | |||
1586 | clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu); | 1589 | clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu); |
1587 | dcpu = migrate_hrtimers(scpu); | 1590 | dcpu = migrate_hrtimers(scpu); |
1588 | smp_call_function_single(dcpu, tickle_timers, NULL, 0); | 1591 | smp_call_function_single(dcpu, tickle_timers, NULL, 0); |
1589 | break; | 1592 | break; |
1593 | } | ||
1590 | #endif | 1594 | #endif |
1591 | 1595 | ||
1592 | default: | 1596 | default: |