Commit cb48bb59 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

x86: remove additional_cpus

remove remainder of additional_cpus logic. We now just listen to the
disabled_cpus value like we did for years. disabled_cpus is always >=
0 so no need for an extra check.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b8073050
...@@ -1261,8 +1261,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus) ...@@ -1261,8 +1261,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
check_nmi_watchdog(); check_nmi_watchdog();
} }
static int additional_cpus = -1;
/* /*
* cpu_possible_map should be static, it cannot change as cpu's * cpu_possible_map should be static, it cannot change as cpu's
* are onlined, or offlined. The reason is per-cpu data-structures * are onlined, or offlined. The reason is per-cpu data-structures
...@@ -1282,21 +1280,13 @@ static int additional_cpus = -1; ...@@ -1282,21 +1280,13 @@ static int additional_cpus = -1;
*/ */
__init void prefill_possible_map(void) __init void prefill_possible_map(void)
{ {
int i; int i, possible;
int possible;
/* no processor from mptable or madt */ /* no processor from mptable or madt */
if (!num_processors) if (!num_processors)
num_processors = 1; num_processors = 1;
if (additional_cpus == -1) { possible = num_processors + disabled_cpus;
if (disabled_cpus > 0)
additional_cpus = disabled_cpus;
else
additional_cpus = 0;
}
possible = num_processors + additional_cpus;
if (possible > NR_CPUS) if (possible > NR_CPUS)
possible = NR_CPUS; possible = NR_CPUS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment