commit b6b301aa9fba57b114c3a00f5f43abf672bd4ecd
author Jaswinder Singh <jaswinder@infradead.org> Tue Dec 23 21:52:33 2008 +0530
committer Ingo Molnar <mingo@elte.hu> Sat Dec 27 11:30:18 2008 +0100
tree 416330b29b40b5dabc9ca898b0d1ddfdc918f526
parent 0b936bfdeb85784b7df132b2c64fb34ad9b11ffa

x86: apic.c x2apic_preenabled and disable_x2apic should be static

Impact: cleanup, reduce kernel size a bit, avoid sparse warning

Fixes sparse warning:

  arch/x86/kernel/apic.c:103:5: warning: symbol 'disable_x2apic' was not declared. Should it be static?

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/include/asm/apic.h

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 25caa07..e644bf6 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -93,7 +93,7 @@
 }
 
 #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);

arch/x86/kernel/apic.c

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 7397911..3a961bd 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -97,8 +97,8 @@
 #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;