projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d5d772
)
[ACPI] fix "nolapic" flag in ACPI mode
author
Andi Kleen
<ak@suse.de>
Mon, 27 Mar 2006 07:24:32 +0000
(
02:24
-0500)
committer
Len Brown
<len.brown@intel.com>
Mon, 27 Mar 2006 07:33:00 +0000
(
02:33
-0500)
Signed-off-by: Len Brown <len.brown@intel.com>
arch/i386/kernel/acpi/boot.c
patch
|
blob
|
history
diff --git
a/arch/i386/kernel/acpi/boot.c
b/arch/i386/kernel/acpi/boot.c
index 033066176b3efdae5a097ca5cf11fbf4b8cd945f..d0980c79a5d274b0a7fa19c320d36c1582f1c601 100644
(file)
--- 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
*/