aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-17 18:17:44 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-17 18:17:44 -0400
commit9c6f7e43b4e02c161b53e97ba913855246876c61 (patch)
treef305ceacff1af61d53bcdd403fced5fef54a7ef0
parenta93d2f1744206827ccf416e2cdc5018aa503314e (diff)
stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback()
This addresses the following compiler warning: kernel/stop_machine.c: In function 'cpu_stop_cpu_callback': kernel/stop_machine.c:297: warning: unused variable 'work' Cc: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <tip-3fc1f1e27a5b807791d72e5d992aa33b668a6626@git.kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/stop_machine.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index ef51d1fcf5e6..b4e7431e7c78 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -294,7 +294,6 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
294 struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 }; 294 struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
295 unsigned int cpu = (unsigned long)hcpu; 295 unsigned int cpu = (unsigned long)hcpu;
296 struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu); 296 struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
297 struct cpu_stop_work *work;
298 struct task_struct *p; 297 struct task_struct *p;
299 298
300 switch (action & ~CPU_TASKS_FROZEN) { 299 switch (action & ~CPU_TASKS_FROZEN) {
@@ -323,6 +322,9 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
323#ifdef CONFIG_HOTPLUG_CPU 322#ifdef CONFIG_HOTPLUG_CPU
324 case CPU_UP_CANCELED: 323 case CPU_UP_CANCELED:
325 case CPU_DEAD: 324 case CPU_DEAD:
325 {
326 struct cpu_stop_work *work;
327
326 /* kill the stopper */ 328 /* kill the stopper */
327 kthread_stop(stopper->thread); 329 kthread_stop(stopper->thread);
328 /* drain remaining works */ 330 /* drain remaining works */
@@ -335,6 +337,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
335 put_task_struct(stopper->thread); 337 put_task_struct(stopper->thread);
336 stopper->thread = NULL; 338 stopper->thread = NULL;
337 break; 339 break;
340 }
338#endif 341#endif
339 } 342 }
340 343