dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[ACPI] fix "nolapic" flag in ACPI mode 

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Andi Kleen 2006-03-27 02:24:32 -05:00 committed by Len Brown
parent 5d5d7727a8
commit 9cfda2c94d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/i386/kernel/acpi/boot.c
View File

@ -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
*/