diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-12-10 19:32:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-10 19:33:03 +0100 |
| commit | 05453d36a2fcaf1ea49939f8f9a8cd9dcd516159 (patch) | |
| tree | cb43431bb6d4dbd428e43680cc070935a2bf6268 /arch/x86/kernel/cpu/topology.c | |
| parent | x86/apic: Remove "disablelapic" cmdline option (diff) | |
| parent | Merge tag 'locking_urgent_for_v6.13_rc3' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.tar.gz linux-05453d36a2fcaf1ea49939f8f9a8cd9dcd516159.zip | |
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>
Diffstat (limited to 'arch/x86/kernel/cpu/topology.c')
| -rw-r--r-- | arch/x86/kernel/cpu/topology.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 6ebed852a9ef..01456236a6dd 100644 --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -428,8 +428,8 @@ void __init topology_apply_cmdline_limits_early(void) { 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' */ + if (!setup_max_cpus || apic_is_disabled) possible = 1; /* 'possible_cpus=N' */ @@ -443,7 +443,7 @@ void __init topology_apply_cmdline_limits_early(void) static __init bool restrict_to_up(void) { - if (!smp_found_config || ioapic_is_disabled) + if (!smp_found_config) return true; /* * XEN PV is special as it does not advertise the local APIC |