Pull novell-bugzilla-156426 into release branch

Conflicts: arch/i386/kernel/acpi/boot.c

Pull novell-bugzilla-156426 into release branch
Conflicts: arch/i386/kernel/acpi/boot.c
4e8f10b7 · Len Brown · 63518472 · 9cfda2c9 · 4e8f10b7
Commit 4e8f10b7 authored Jun 15, 2006 by Len Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

arch/i386/kernel/acpi/boot.c arch/i386/kernel/acpi/boot.c +2 -2

No files found.
--- 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);