kernel/stop_machine.c: remove CONFIG_SMP dependencies
authorAndrew Morton <akpm@linux-foundation.org>
Sat, 16 Jan 2016 00:58:16 +0000 (16:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jan 2016 19:17:24 +0000 (11:17 -0800)
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>
kernel/stop_machine.c

index edb6de4f5908cefc7e9a792adfea5998c4ae9a87..a467e6c28a3b2d4be1ecfa5c14d3a35d1ef304f8 100644 (file)
@@ -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 */