diff options
| author | Andi Kleen <ak@suse.de> | 2006-03-27 02:24:32 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-03-27 02:33:00 -0500 |
| commit | 9cfda2c94df61c9f859b474abe774c65a4464d0a (patch) | |
| tree | d6fa93519c2182f89d36c59dd9176dec264e8594 /arch/i386/kernel/acpi/boot.c | |
| parent | 5d5d7727a8cde78f798ecf04bac8031eff536f9d (diff) | |
[ACPI] fix "nolapic" flag in ACPI mode
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/acpi/boot.c')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 033066176b3..d0980c79a5d 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c @@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size) { struct acpi_table_madt *madt = NULL; - if (!phys_addr || !size) + if (!phys_addr || !size || !cpu_has_apic) return -EINVAL; madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size); @@ -751,6 +751,9 @@ static int __init acpi_parse_madt_ioapic_entries(void) return -ENODEV; } + if (!cpu_has_apic) + return -ENODEV; + /* * if "noapic" boot option, don't look for IO-APICs */ |