From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 21 Jul 2008 18:21:43 +0000 (-0700)
Subject: x86: use setup_clear_cpu_cap with disable_apic, fix
X-Git-Tag: v2.6.27-rc1~863^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=988781dc3e1d9209192b04458d279815923f5e76;p=linux-2.6-omap-h63xx.git

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

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index ec952aa5394..b4aacb9f52e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -680,7 +680,7 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_X86_LOCAL_APIC
 		disable_apic = 1;
 #endif
-		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
+		setup_clear_cpu_cap(X86_FEATURE_APIC);
 	}
 
 #ifdef CONFIG_PCI