The following commit has been merged into the x86/cpu branch of tip: Commit-ID: f74642d81c24d9e69745cd0b75e1bddc81827606 Gitweb: https://git.kernel.org/tip/f74642d81c24d9e69745cd0b75e1bddc81827606 Author: Shivank Garg <shivankg@xxxxxxx> AuthorDate: Tue, 12 Nov 2024 07:23:47 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Tue, 12 Nov 2024 11:00:50 +01:00 x86/cpu: Remove redundant CONFIG_NUMA guard around numa_add_cpu() Remove unnecessary CONFIG_NUMA #ifdef around numa_add_cpu() since the function is already properly handled in <asm/numa.h> for both NUMA and non-NUMA configurations. For !CONFIG_NUMA builds, numa_add_cpu() is defined as an empty function. Simplify the code without any functionality change. Testing: Build CONFIG_NUMA=n Signed-off-by: Shivank Garg <shivankg@xxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Link: https://lore.kernel.org/r/20241112072346.428623-1-shivankg@xxxxxxx --- arch/x86/kernel/cpu/common.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 07a34d7..59dc735 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1902,9 +1902,7 @@ static void identify_cpu(struct cpuinfo_x86 *c) /* Init Machine Check Exception if available. */ mcheck_cpu_init(c); -#ifdef CONFIG_NUMA numa_add_cpu(smp_processor_id()); -#endif } /*