Browse Source

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>
Jaswinder Singh 16 years ago
parent
commit
b6b301aa9f
2 changed files with 3 additions and 3 deletions
  1. 1 1
      arch/x86/include/asm/apic.h
  2. 2 2
      arch/x86/kernel/apic.c

+ 1 - 1
arch/x86/include/asm/apic.h

@@ -93,7 +93,7 @@ static inline u32 native_apic_msr_read(u32 reg)
 }
 }
 
 
 #ifndef CONFIG_X86_32
 #ifndef CONFIG_X86_32
-extern int x2apic, x2apic_preenabled;
+extern int x2apic;
 extern void check_x2apic(void);
 extern void check_x2apic(void);
 extern void enable_x2apic(void);
 extern void enable_x2apic(void);
 extern void enable_IR_x2apic(void);
 extern void enable_IR_x2apic(void);

+ 2 - 2
arch/x86/kernel/apic.c

@@ -97,8 +97,8 @@ __setup("apicpmtimer", setup_apicpmtimer);
 #ifdef HAVE_X2APIC
 #ifdef HAVE_X2APIC
 int x2apic;
 int x2apic;
 /* x2apic enabled before OS handover */
 /* 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)
 static __init int setup_nox2apic(char *str)
 {
 {
 	disable_x2apic = 1;
 	disable_x2apic = 1;