hrtimers: fix warning in kernel/hrtimer.c
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 23:48:27 +0000 (00:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Dec 2008 23:45:32 +0000 (00:45 +0100)
this warning:

  kernel/hrtimer.c: In function ‘hrtimer_cpu_notify’:
  kernel/hrtimer.c:1574: warning: unused variable ‘dcpu’

is caused because 'dcpu' is only used in the CONFIG_HOTPLUG_CPU case.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/hrtimer.c

index b741f85..bda9cb9 100644 (file)
@@ -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: