diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-08 10:20:53 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-05-08 11:12:33 -0400 |
commit | bbf1bb3eee86f2eef2baa14e600be454d09109ee (patch) | |
tree | f7c200742a2d6ce20e72ad976b66d30d1aa6a04d /kernel/stop_machine.c | |
parent | fc390cde362309f6892bb719194f242c466a978b (diff) |
cpu_stop: add dummy implementation for UP
When !CONFIG_SMP, cpu_stop functions weren't defined at all which
could lead to build failures if UP code uses cpu_stop facility. Add
dummy cpu_stop implementation for UP. The waiting variants execute
the work function directly with preempt disabled and
stop_one_cpu_nowait() schedules a workqueue work.
Makefile and ifdefs around stop_machine implementation are updated to
accomodate CONFIG_SMP && !CONFIG_STOP_MACHINE case.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/stop_machine.c')
-rw-r--r-- | kernel/stop_machine.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index 5b20141a5ec1..ef51d1fcf5e6 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
@@ -375,6 +375,8 @@ static int __init cpu_stop_init(void) | |||
375 | } | 375 | } |
376 | early_initcall(cpu_stop_init); | 376 | early_initcall(cpu_stop_init); |
377 | 377 | ||
378 | #ifdef CONFIG_STOP_MACHINE | ||
379 | |||
378 | /* This controls the threads on each CPU. */ | 380 | /* This controls the threads on each CPU. */ |
379 | enum stopmachine_state { | 381 | enum stopmachine_state { |
380 | /* Dummy starting state for thread. */ | 382 | /* Dummy starting state for thread. */ |
@@ -477,3 +479,5 @@ int stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus) | |||
477 | return ret; | 479 | return ret; |
478 | } | 480 | } |
479 | EXPORT_SYMBOL_GPL(stop_machine); | 481 | EXPORT_SYMBOL_GPL(stop_machine); |
482 | |||
483 | #endif /* CONFIG_STOP_MACHINE */ | ||