diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2016-01-15 16:58:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-16 11:17:24 -0800 |
commit | b493c34309cb4aebc44272897067ebf54cb07271 (patch) | |
tree | edad645b4ef93e726dcf647ee1ebbbd7e7394308 | |
parent | b2113a417c4f414eb19c11a6a72abedabd81dc1b (diff) | |
download | linux-stable-b493c34309cb4aebc44272897067ebf54cb07271.tar.gz linux-stable-b493c34309cb4aebc44272897067ebf54cb07271.tar.bz2 linux-stable-b493c34309cb4aebc44272897067ebf54cb07271.zip |
kernel/stop_machine.c: remove CONFIG_SMP dependencies
stop_machine.o is only built if CONFIG_SMP=y, so this ifdef always
evaluates to true.
[akpm@linux-foundation.org: remove now-unneeded ifdef]
Reported-by: Valentin Rothberg <valentinrothberg@gmail.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/stop_machine.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index edb6de4f5908..a467e6c28a3b 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -529,8 +529,6 @@ static int __init cpu_stop_init(void) } early_initcall(cpu_stop_init); -#if defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU) - static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus) { struct multi_stop_data msdata = { @@ -628,5 +626,3 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data, mutex_unlock(&stop_cpus_mutex); return ret ?: done.ret; } - -#endif /* CONFIG_SMP || CONFIG_HOTPLUG_CPU */ |