diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-25 13:51:46 +0100 |
| commit | 0b271ef4521756010675b1611bef20fd3096790d (patch) | |
| tree | 2c9d22a2c74122a9904e533df27f41d63ffef394 /arch/x86/kernel/mpparse.c | |
| parent | Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor... (diff) | |
| parent | Linux 2.6.28 (diff) | |
| download | linux-0b271ef4521756010675b1611bef20fd3096790d.tar.xz linux-0b271ef4521756010675b1611bef20fd3096790d.zip | |
Merge commit 'v2.6.28' into core/core
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -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) |