From add7ebde991859bfef76e045a21ba768c2c67965 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 21 Jul 2008 11:21:43 -0700
Subject: [PATCH] --- yaml --- r: 104857 b: refs/heads/master c:
 988781dc3e1d9209192b04458d279815923f5e76 h: refs/heads/master i:   104855:
 5298320c9d9b1c80957ca4618fddc59920c026c6 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b7a7d960e5f1..e46416b0a75a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5171c3047df9d5b5183b2b179aa797a5aed8369b
+refs/heads/master: 988781dc3e1d9209192b04458d279815923f5e76
diff --git a/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index ec952aa5394a..b4aacb9f52e3 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/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