Prev: PM / PCI: Update PCI power management documentation
Next: [tip:perf/core] perf tools: Add mode to build without newt support
From: tip-bot for Ingo Molnar on 17 May 2010 18:40
Commit-ID: 9c6f7e43b4e02c161b53e97ba913855246876c61
Gitweb: http://git.kernel.org/tip/9c6f7e43b4e02c161b53e97ba913855246876c61
Author: Ingo Molnar <mingo(a)elte.hu>
AuthorDate: Tue, 18 May 2010 00:17:44 +0200
Committer: Ingo Molnar <mingo(a)elte.hu>
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 <tj(a)kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl>
LKML-Reference: <tip-3fc1f1e27a5b807791d72e5d992aa33b668a6626(a)git.kernel.org>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
kernel/stop_machine.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index ef51d1f..b4e7431 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,
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
}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: PM / PCI: Update PCI power management documentation
Next: [tip:perf/core] perf tools: Add mode to build without newt support