Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9adc1386 authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

x86: fix early panic with boot option "nosmp" 



Impact: fix boot crash with numcpus=0 on certain systems

Fix early exception in __get_smp_config with nosmp.

Bail out early when there is no MP table.

Reported-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Tested-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 66a05d6b

arch/x86/kernel/mpparse.c

+3 −0
Original line number Diff line number Diff line
@@ -604,6 +604,9 @@ static void __init __get_smp_config(unsigned int early) 
		printk(KERN_INFO "Using ACPI for processor (LAPIC) "

		       "configuration information\n");



	if (!mpf)

		return;



	printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",

	       mpf->mpf_specification);

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)