diff options
| author | Andi Kleen <andi@firstfloor.org> | 2008-12-04 13:33:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 16:33:51 +0100 |
| commit | 9adc13867ec5fe0cd35434f92954d90e42381f0b (patch) | |
| tree | b1223c5c256cdd04395e7d205eea865db18a617a /arch/x86 | |
| parent | Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-9adc13867ec5fe0cd35434f92954d90e42381f0b.tar.xz linux-9adc13867ec5fe0cd35434f92954d90e42381f0b.zip | |
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: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Tested-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f98f4e1dba09..0f4c1fd5a1f4 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -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) |