From 34854d0d286dba1345c5a024ffdea03245e46988 Mon Sep 17 00:00:00 2001
From: Jaswinder Singh <jaswinder@infradead.org>
Date: Tue, 23 Dec 2008 21:52:33 +0530
Subject: [PATCH] --- yaml --- r: 125398 b: refs/heads/master c:
 b6b301aa9fba57b114c3a00f5f43abf672bd4ecd h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/apic.h | 2 +-
 trunk/arch/x86/kernel/apic.c      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index af5ed3b0fcb4..95b9a459f5ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b936bfdeb85784b7df132b2c64fb34ad9b11ffa
+refs/heads/master: b6b301aa9fba57b114c3a00f5f43abf672bd4ecd
diff --git a/trunk/arch/x86/include/asm/apic.h b/trunk/arch/x86/include/asm/apic.h
index 25caa0738af5..e644bf6f90dc 100644
--- a/trunk/arch/x86/include/asm/apic.h
+++ b/trunk/arch/x86/include/asm/apic.h
@@ -93,7 +93,7 @@ static inline u32 native_apic_msr_read(u32 reg)
 }
 
 #ifndef CONFIG_X86_32
-extern int x2apic, x2apic_preenabled;
+extern int x2apic;
 extern void check_x2apic(void);
 extern void enable_x2apic(void);
 extern void enable_IR_x2apic(void);
diff --git a/trunk/arch/x86/kernel/apic.c b/trunk/arch/x86/kernel/apic.c
index 7397911f8478..3a961bd9f619 100644
--- a/trunk/arch/x86/kernel/apic.c
+++ b/trunk/arch/x86/kernel/apic.c
@@ -97,8 +97,8 @@ __setup("apicpmtimer", setup_apicpmtimer);
 #ifdef HAVE_X2APIC
 int x2apic;
 /* x2apic enabled before OS handover */
-int x2apic_preenabled;
-int disable_x2apic;
+static int x2apic_preenabled;
+static int disable_x2apic;
 static __init int setup_nox2apic(char *str)
 {
 	disable_x2apic = 1;