Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8f10b7 authored by Len Brown's avatar Len Brown
Browse files

Pull novell-bugzilla-156426 into release branch 

Conflicts:

	arch/i386/kernel/acpi/boot.c
parents 63518472 9cfda2c9

arch/i386/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -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);