kernel/stop_machine.c: remove CONFIG_SMP dependencies

akpm00 · torvalds · commit b493c34309cb · 2016-01-16T11:17:24.000-08:00
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 &lt;valentinrothberg@gmail.com&gt;
Cc: Chris Wilson &lt;chris@chris-wilson.co.uk&gt;
Cc: Ingo Molnar &lt;mingo@kernel.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -529,8 +529,6 @@ static int __init cpu_stop_init(void)`
`529`	`529`	`}`
`530`	`530`	`early_initcall(cpu_stop_init);`
`531`	`531`
`532`		`-#if defined(CONFIG_SMP) \|\| defined(CONFIG_HOTPLUG_CPU)`
`533`		`-`
`534`	`532`	`static int __stop_machine(cpu_stop_fn_t fn, void data, const struct cpumask cpus)`
`535`	`533`	`{`
`536`	`534`	`struct multi_stop_data msdata = {`
`@@ -628,5 +626,3 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,`
`628`	`626`	`mutex_unlock(&stop_cpus_mutex);`
`629`	`627`	`return ret ?: done.ret;`
`630`	`628`	`}`
`631`		`-`
`632`		`-#endif /* CONFIG_SMP \|\| CONFIG_HOTPLUG_CPU */`