diff options
| author | Andi Kleen | 2006-04-07 19:49:42 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-04-09 20:53:51 +0200 |
| commit | d1530d82e02fd96d4634a6d6f6538c8b778c43af (patch) | |
| tree | f825ae536b1ee15208b0917de54e42e528b59be6 /arch/x86_64/kernel/setup.c | |
| parent | [PATCH] x86-64/i386: Don't process APICs/IO-APICs in ACPI when APIC is disabled. (diff) | |
| download | kernel-qcow2-linux-d1530d82e02fd96d4634a6d6f6538c8b778c43af.tar.gz kernel-qcow2-linux-d1530d82e02fd96d4634a6d6f6538c8b778c43af.tar.xz kernel-qcow2-linux-d1530d82e02fd96d4634a6d6f6538c8b778c43af.zip | |
[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>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 0856ad444f90..c50b06765a80 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -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; |