Skip to content

Commit

Permalink
[ACPI] fix "nolapic" flag in ACPI mode
Browse files Browse the repository at this point in the history
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Andi Kleen authored and Len Brown committed Mar 27, 2006
1 parent 5d5d772 commit 9cfda2c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/i386/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
*/
Expand Down

0 comments on commit 9cfda2c

Please sign in to comment.