Skip to contentSkip to conversation

x86: apic.c x2apic_preenabled and disable_x2apic should be static

PATCH Applied Jaswinder Singh 2 participants 2 messages Dec 23, 2008 – Dec 27, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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?

---
 arch/x86/include/asm/apic.h |    2 +-
 arch/x86/kernel/apic.c      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/include/asm/apic.h +1 -1
index 25caa07..e644bf6 100644
@@ -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);
arch/x86/kernel/apic.c +2 -2
index a477c0f..cf1cc87 100644
@@ -99,8 +99,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;
Signature · 1 line
1.5.5.1
Applied
#1 lore raw
Quoted 10 lines · Jaswinder Singh

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?

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

applied to tip/x86/cleanups, thanks!

Ingo