[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: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen 2006-04-07 19:49:42 +02:00 committed by Linus Torvalds
parent d3b6a349d2
commit d1530d82e0

View File

@ -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;