The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 429bb0269058e2e1f4ab69a0d33d374933aa15b9
Gitweb: https://git.kernel.org/tip/429bb0269058e2e1f4ab69a0d33d374933aa15b9
Author: Ingo Molnar <mingo@xxxxxxxxxx>
AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Mon, 26 Feb 2024 12:13:40 +01:00
smp: Provide 'setup_max_cpus' definition on UP too
This was already defined locally by init/main.c, but let's make
it generic, as arch/x86/kernel/cpu/topology.c is going to make
use of it to have more uniform code.
[ Keep it a C variable, not a define, because there's
some namespace overlap for the 'setup_max_cpus' token
in existing function argument names. ]
Reviewed-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
--
---
include/linux/smp.h | 2 ++
init/main.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/smp.h b/include/linux/smp.h
index e87520d..5a5985f 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -218,6 +218,8 @@ smp_call_function_any(const struct cpumask *mask, smp_call_func_t func,
static inline void kick_all_cpus_sync(void) { }
static inline void wake_up_all_idle_cpus(void) { }
+static const unsigned int setup_max_cpus = 0;
+
#ifdef CONFIG_UP_LATE_INIT
extern void __init up_late_init(void);
static inline void smp_init(void) { up_late_init(); }
diff --git a/init/main.c b/init/main.c
index e24b078..5644bb1 100644
--- a/init/main.c
+++ b/init/main.c
@@ -603,7 +603,6 @@ static int __init rdinit_setup(char *str)
__setup("rdinit=", rdinit_setup);
#ifndef CONFIG_SMP
-static const unsigned int setup_max_cpus = NR_CPUS;
static inline void setup_nr_cpu_ids(void) { }
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
#endif
|