[<prev] [next>] [day] [month] [year] [list]
Message-ID: <170894808573.398.6836010228517643879.tip-bot2@tip-bot2>
Date: Mon, 26 Feb 2024 11:48:05 -0000
From: "tip-bot2 for Ingo Molnar" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>, linux-kernel@...r.kernel.org,
Ingo Molnar <mingo@...nel.org>, x86@...nel.org
Subject: [tip: x86/apic] x86/apic: Build the x86 topology enumeration
functions on UP APIC builds too
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 62aaed88843a9a69b5614f99ec4a2930edd09658
Gitweb: https://git.kernel.org/tip/62aaed88843a9a69b5614f99ec4a2930edd09658
Author: Ingo Molnar <mingo@...nel.org>
AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Mon, 26 Feb 2024 12:14:42 +01:00
x86/apic: Build the x86 topology enumeration functions on UP APIC builds too
These functions are mostly pointless on UP, but nevertheless the
64-bit UP APIC build already depends on the existence of
topology_apply_cmdline_limits_early(), which caused a build bug,
resolve it by making them available under CONFIG_X86_LOCAL_APIC,
as their prototypes already are.
Reviewed-by: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-kernel@...r.kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index 41dd8e0..43650fe 100644
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -344,7 +344,7 @@ void topology_hotunplug_apic(unsigned int cpu)
}
#endif
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_LOCAL_APIC
static unsigned int max_possible_cpus __initdata = NR_CPUS;
/**
Powered by blists - more mailing lists