From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 10 Dec 2024 18:32:36 +0000 (+0100)
Subject: Merge branch 'linus' into x86/cleanups, to resolve conflict
X-Git-Tag: v6.14-rc1~185^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05453d36a2fcaf1ea49939f8f9a8cd9dcd516159;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'linus' into x86/cleanups, to resolve conflict

These two commits interact:

 upstream:     73da582a476e ("x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC")
 x86/cleanups: 13148e22c151 ("x86/apic: Remove "disablelapic" cmdline option")

Resolve it.

 Conflicts:
	arch/x86/kernel/cpu/topology.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

05453d36a2fcaf1ea49939f8f9a8cd9dcd516159
diff --cc arch/x86/kernel/cpu/topology.c
index 6ebed852a9ef7,b2e313ea17bf6..01456236a6dd3
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@@ -428,8 -428,8 +428,8 @@@ void __init topology_apply_cmdline_limi
  {
  	unsigned int possible = nr_cpu_ids;
  
- 	/* 'maxcpus=0' 'nosmp' 'nolapic' 'noapic' */
- 	if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled)
 -	/* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' */
++	/* 'maxcpus=0' 'nosmp' 'nolapic' */
+ 	if (!setup_max_cpus || apic_is_disabled)
  		possible = 1;
  
  	/* 'possible_cpus=N' */