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

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

[PATCH] Remove wrong cpu_has_apic checks that came from mismerging 



We only need to check cpu_has_apic in the IO-APIC/L-APIC parsing, not for
all of ACPI.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 30d55280

arch/i386/kernel/acpi/boot.c

+0 −6
Original line number Diff line number Diff line
@@ -1102,9 +1102,6 @@ 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
@@ -1151,9 +1148,6 @@ int __init acpi_boot_init(void) 


	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);



	if (!cpu_has_apic)

		return -ENODEV;



	/*

	 * set sci_int and PM timer address

	 */