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
tcp: fix tcp_fastopen unaligned access complaints on sparc
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
stop_machine.h
diff --git
a/include/linux/stop_machine.h
b/include/linux/stop_machine.h
index 0adedca24c5bfbd4ca7a25b80641e76e0e638738..0e1b1540597a47253b6a2e5cc3ef1709d4a42992 100644
(file)
--- a/
include/linux/stop_machine.h
+++ b/
include/linux/stop_machine.h
@@
-99,7
+99,7
@@
static inline int try_stop_cpus(const struct cpumask *cpumask,
* grabbing every spinlock (and more). So the "read" side to such a
* lock is anything which disables preemption.
*/
* grabbing every spinlock (and more). So the "read" side to such a
* lock is anything which disables preemption.
*/
-#if defined(CONFIG_S
TOP_MACHINE) && defined(CONFIG_SMP
)
+#if defined(CONFIG_S
MP) || defined(CONFIG_HOTPLUG_CPU
)
/**
* stop_machine: freeze the machine on all CPUs and run this function
/**
* stop_machine: freeze the machine on all CPUs and run this function
@@
-118,7
+118,7
@@
int stop_machine(cpu_stop_fn_t fn, void *data, const struct cpumask *cpus);
int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus);
int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus);
-#else
/* CONFIG_STOP_MACHINE && CONFIG_SMP
*/
+#else
/* CONFIG_SMP || CONFIG_HOTPLUG_CPU
*/
static inline int stop_machine(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus)
static inline int stop_machine(cpu_stop_fn_t fn, void *data,
const struct cpumask *cpus)
@@
-137,5
+137,5
@@
static inline int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
return stop_machine(fn, data, cpus);
}
return stop_machine(fn, data, cpus);
}
-#endif /* CONFIG_S
TOP_MACHINE && CONFIG_SMP
*/
+#endif /* CONFIG_S
MP || CONFIG_HOTPLUG_CPU
*/
#endif /* _LINUX_STOP_MACHINE */
#endif /* _LINUX_STOP_MACHINE */