diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-21 14:21:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:05:45 -0400 |
commit | 988781dc3e1d9209192b04458d279815923f5e76 (patch) | |
tree | b097aac0c57c65b484246403d3092300373b18dd /arch | |
parent | 5171c3047df9d5b5183b2b179aa797a5aed8369b (diff) |
x86: use setup_clear_cpu_cap with disable_apic, fix
beauty fix: /proc/cpuinfo will still show apic feature even if
we booted up with it disabled.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index ec952aa5394a..b4aacb9f52e3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -680,7 +680,7 @@ void __init setup_arch(char **cmdline_p) | |||
680 | #ifdef CONFIG_X86_LOCAL_APIC | 680 | #ifdef CONFIG_X86_LOCAL_APIC |
681 | disable_apic = 1; | 681 | disable_apic = 1; |
682 | #endif | 682 | #endif |
683 | clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC); | 683 | setup_clear_cpu_cap(X86_FEATURE_APIC); |
684 | } | 684 | } |
685 | 685 | ||
686 | #ifdef CONFIG_PCI | 686 | #ifdef CONFIG_PCI |