* [tip: x86/apic] x86/apic: Build the x86 topology enumeration functions on UP APIC builds too
@ 2024-02-26 11:48 tip-bot2 for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2024-02-26 11:48 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Thomas Gleixner, linux-kernel, Ingo Molnar, x86
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@kernel.org>
AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00
Committer: Ingo Molnar <mingo@kernel.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@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.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;
/**
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/apic] x86/apic: Build the x86 topology enumeration functions on UP APIC builds too
@ 2024-02-27 9:17 tip-bot2 for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Ingo Molnar @ 2024-02-27 9:17 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Thomas Gleixner, linux-kernel, Ingo Molnar, x86
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 6be4ec29685c216ebec61d35f56c3808092498aa
Gitweb: https://git.kernel.org/tip/6be4ec29685c216ebec61d35f56c3808092498aa
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Mon, 26 Feb 2024 12:07:31 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 27 Feb 2024 10:05:41 +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@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.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;
/**
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-27 9:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-26 11:48 [tip: x86/apic] x86/apic: Build the x86 topology enumeration functions on UP APIC builds too tip-bot2 for Ingo Molnar
2024-02-27 9:17 tip-bot2 for Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).