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

Commit 87cb23a4 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] i386/x86-64: Fix ACPI disabled LAPIC handling mismerge 



The patch I submitted earlier to fix disabled LAPIC handling in ACPI
was mismerged for some reason I still don't quite understand. Parts
of it was applied to the wrong function.

This patch fixes it up.

Cc: len.brown@intel.com

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d16e8624

arch/i386/kernel/acpi/boot.c

+4 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) 
	unsigned long i;

	int config_size;



	if (!phys_addr || !size || !cpu_has_apic)

	if (!phys_addr || !size)

		return -EINVAL;



	mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
@@ -1102,6 +1102,9 @@ int __init acpi_boot_table_init(void) 
	dmi_check_system(acpi_dmi_table);

#endif



	if (!cpu_has_apic)

		return -ENODEV;



	/*

	 * If acpi_disabled, bail out

	 * One exception: acpi=ht continues far enough to enumerate LAPICs