Skip to content

Commit 73da582

Browse files
ffmanceraKAGA-KOKO
authored andcommitted
x86/cpu/topology: Remove limit of CPUs due to disabled IO/APIC
The rework of possible CPUs management erroneously disabled SMP when the IO/APIC is disabled either by the 'noapic' command line parameter or during IO/APIC setup. SMP is possible without IO/APIC. Remove the ioapic_is_disabled conditions from the relevant possible CPU management code paths to restore the orgininal behaviour. Fixes: 7c0edad ("x86/cpu/topology: Rework possible CPU management") Signed-off-by: Fernando Fernandez Mancera <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/all/[email protected]
1 parent d0ceea6 commit 73da582

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/kernel/cpu/topology.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ void __init topology_apply_cmdline_limits_early(void)
428428
{
429429
unsigned int possible = nr_cpu_ids;
430430

431-
/* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' 'noapic' */
432-
if (!setup_max_cpus || ioapic_is_disabled || apic_is_disabled)
431+
/* 'maxcpus=0' 'nosmp' 'nolapic' 'disableapic' */
432+
if (!setup_max_cpus || apic_is_disabled)
433433
possible = 1;
434434

435435
/* 'possible_cpus=N' */
@@ -443,7 +443,7 @@ void __init topology_apply_cmdline_limits_early(void)
443443

444444
static __init bool restrict_to_up(void)
445445
{
446-
if (!smp_found_config || ioapic_is_disabled)
446+
if (!smp_found_config)
447447
return true;
448448
/*
449449
* XEN PV is special as it does not advertise the local APIC

0 commit comments

Comments
 (0)