From ef765a380c91e184b600d19ae53b510bcd03e9d1 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 18 Apr 2006 12:35:10 +0200 Subject: [PATCH] --- yaml --- r: 25883 b: refs/heads/master c: 87cb23a48c208f31ab87c7a2aad37dbb355575f3 h: refs/heads/master i: 25881: 71ab6f06a9d5aa2c9b1cd2f01208310787265df6 25879: 6ee017b83e5a8f9be5148556b02bd062407ff825 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/acpi/boot.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0487a3bcf21b..767c18af35c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d16e86243ecf6f8fb97b5b7d685e0afa77a123e5 +refs/heads/master: 87cb23a48c208f31ab87c7a2aad37dbb355575f3 diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c index 030a0007a4e0..049a25583793 100644 --- a/trunk/arch/i386/kernel/acpi/boot.c +++ b/trunk/arch/i386/kernel/acpi/boot.c @@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) unsigned long i; int config_size; - if (!phys_addr || !size || !cpu_has_apic) + if (!phys_addr || !size) return -EINVAL; mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size); @@ -1102,6 +1102,9 @@ int __init acpi_boot_table_init(void) dmi_check_system(acpi_dmi_table); #endif + if (!cpu_has_apic) + return -ENODEV; + /* * If acpi_disabled, bail out * One exception: acpi=ht continues far enough to enumerate LAPICs