Pull novell-bugzilla-156426 into release branch

Conflicts: arch/i386/kernel/acpi/boot.c
git-mirror · Jun 15, 2006 · 4e8f10b · 4e8f10b
2 parents 6351847 + 9cfda2c
commit 4e8f10b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);
@@ -754,7 +754,7 @@ static int __init acpi_parse_madt_ioapic_entries(void)
 		return -ENODEV;
 	}
 
-	if (!cpu_has_apic)
+	if (!cpu_has_apic) 
 		return -ENODEV;
 
 	/*