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

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

[PATCH] x86_64: Clear APIC feature bit when local APIC is disabled 



Needed for other checks later in ACPI.

Pointed out by Len Brown

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

arch/x86_64/kernel/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -353,8 +353,10 @@ static __init void parse_cmdline_early (char ** cmdline_p) 
		if (fullarg(from, "enable_timer_pin_1"))

			disable_timer_pin_1 = -1;



		if (fullarg(from, "nolapic") || fullarg(from, "disableapic"))

		if (fullarg(from, "nolapic") || fullarg(from, "disableapic")) {

			clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);

			disable_apic = 1;

		}



		if (fullarg(from, "noapic"))

			skip_ioapic_setup = 1;