projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: PCI/ASPM: Remove redundant check of pcie_set_clkpm
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
stop_machine.c
diff --git
a/kernel/stop_machine.c
b/kernel/stop_machine.c
index 867bc20e1ef142a63349c345932af24b26a1adfc..a3bbaee77c586e9836567f900012aa5231e94dbd 100644
(file)
--- a/
kernel/stop_machine.c
+++ b/
kernel/stop_machine.c
@@
-531,7
+531,7
@@
static int __init cpu_stop_init(void)
}
early_initcall(cpu_stop_init);
}
early_initcall(cpu_stop_init);
-#if
def CONFIG_STOP_MACHINE
+#if
defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
{
static int __stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus)
{
@@
-631,4
+631,4
@@
int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
return ret ?: done.ret;
}
return ret ?: done.ret;
}
-#endif /* CONFIG_S
TOP_MACHINE
*/
+#endif /* CONFIG_S
MP || CONFIG_HOTPLUG_CPU
*/