[ACPI] fix "nolapic" flag in ACPI mode
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Родитель
5d5d7727a8
Коммит
9cfda2c94d
|
@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
|
||||||
{
|
{
|
||||||
struct acpi_table_madt *madt = NULL;
|
struct acpi_table_madt *madt = NULL;
|
||||||
|
|
||||||
if (!phys_addr || !size)
|
if (!phys_addr || !size || !cpu_has_apic)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
|
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;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!cpu_has_apic)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if "noapic" boot option, don't look for IO-APICs
|
* if "noapic" boot option, don't look for IO-APICs
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче