Skip to contentSkip to conversation

stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback()

tip:sched/core tip-bot for Ingo Molnar 1 participant 1 message May 17, 2010 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Commit-ID:  9c6f7e43b4e02c161b53e97ba913855246876c61
Gitweb:     http://git.kernel.org/tip/9c6f7e43b4e02c161b53e97ba913855246876c61
Author:     Ingo Molnar <[email protected]>
AuthorDate: Tue, 18 May 2010 00:17:44 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 18 May 2010 00:17:44 +0200

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 <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>

---
 kernel/stop_machine.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
kernel/stop_machine.c +4 -1
index ef51d1f..b4e7431 100644
@@ -294,7 +294,6 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
 	struct sched_param param = { .sched_priority = MAX_RT_PRIO - 1 };
 	unsigned int cpu = (unsigned long)hcpu;
 	struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
-	struct cpu_stop_work *work;
 	struct task_struct *p;
 
 	switch (action & ~CPU_TASKS_FROZEN) {
@@ -323,6 +322,9 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
 #ifdef CONFIG_HOTPLUG_CPU
 	case CPU_UP_CANCELED:
 	case CPU_DEAD:
+	{
+		struct cpu_stop_work *work;
+
 		/* kill the stopper */
 		kthread_stop(stopper->thread);
 		/* drain remaining works */
@@ -335,6 +337,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
 		put_task_struct(stopper->thread);
 		stopper->thread = NULL;
 		break;
+	}
 #endif
 	}