Merge branch 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block

[firefly-linux-kernel-4.4.55.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b741f850426e5ba8841feca4c730f3da1c65f7b8..bda9cb92427673a4c2e47676596e854d57d7dca3 100644 (file)
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1571,7 +1571,7 @@ static void tickle_timers(void *arg)
 static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
                                        unsigned long action, void *hcpu)
 {
-       int dcpu, scpu = (long)hcpu;
+       int scpu = (long)hcpu;
 
        switch (action) {
 
@@ -1583,10 +1583,14 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_DEAD:
        case CPU_DEAD_FROZEN:
+       {
+               int dcpu;
+
                clockevents_notify(CLOCK_EVT_NOTIFY_CPU_DEAD, &scpu);
                dcpu = migrate_hrtimers(scpu);
                smp_call_function_single(dcpu, tickle_timers, NULL, 0);
                break;
+       }
 #endif
 
        default: