This is the last direct user of cpu_up() before we can hide it now as
internal implementation detail of the cpu subsystem.
Signed-off-by: Qais Yousef <[email protected]>
CC: Thomas Gleixner <[email protected]>
CC: Josh Poimboeuf <[email protected]>
CC: "Peter Zijlstra (Intel)" <[email protected]>
CC: Jiri Kosina <[email protected]>
CC: Nicholas Piggin <[email protected]>
CC: Daniel Lezcano <[email protected]>
CC: Ingo Molnar <[email protected]>
CC: Eiichi Tsukata <[email protected]>
CC: Zhenzhong Duan <[email protected]>
CC: Nadav Amit <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
CC: "Rafael J. Wysocki" <[email protected]>
CC: [email protected]
---
include/linux/cpu.h | 1 +
kernel/cpu.c | 12 ++++++++++++
kernel/smp.c | 9 +--------
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index f05168b49fab..b5d9287899d1 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -93,6 +93,7 @@ void notify_cpu_starting(unsigned int cpu);
extern void cpu_maps_update_begin(void);
extern void cpu_maps_update_done(void);
extern int bringup_hibernate_cpu(unsigned int sleep_cpu);
+extern void smp_bringup_nonboot_cpus(unsigned int setup_max_cpus);
#else /* CONFIG_SMP */
#define cpuhp_tasks_frozen 0
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 9610442c8dbc..3631184a284f 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1245,6 +1245,18 @@ int bringup_hibernate_cpu(unsigned int sleep_cpu)
return 0;
}
+void smp_bringup_nonboot_cpus(unsigned int setup_max_cpus)
+{
+ unsigned int cpu;
+
+ for_each_present_cpu(cpu) {
+ if (num_online_cpus() >= setup_max_cpus)
+ break;
+ if (!cpu_online(cpu))
+ cpu_up(cpu);
+ }
+}
+
#ifdef CONFIG_PM_SLEEP_SMP
static cpumask_var_t frozen_cpus;
diff --git a/kernel/smp.c b/kernel/smp.c
index 7dbcb402c2fc..74134272b5aa 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -578,20 +578,13 @@ void __init setup_nr_cpu_ids(void)
void __init smp_init(void)
{
int num_nodes, num_cpus;
- unsigned int cpu;
idle_threads_init();
cpuhp_threads_init();
pr_info("Bringing up secondary CPUs ...\n");
- /* FIXME: This should be done in userspace --RR */
- for_each_present_cpu(cpu) {
- if (num_online_cpus() >= setup_max_cpus)
- break;
- if (!cpu_online(cpu))
- cpu_up(cpu);
- }
+ smp_bringup_nonboot_cpus(setup_max_cpus);
num_nodes = num_online_nodes();
num_cpus = num_online_cpus();
--
2.17.1