aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJaswinder Singh <jaswinder@infradead.org>2008-12-23 11:22:33 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-27 05:30:18 -0500
commitb6b301aa9fba57b114c3a00f5f43abf672bd4ecd (patch)
tree416330b29b40b5dabc9ca898b0d1ddfdc918f526 /arch/x86
parent0b936bfdeb85784b7df132b2c64fb34ad9b11ffa (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/apic.h2
-rw-r--r--arch/x86/kernel/apic.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 25caa0738af5..e644bf6f90dc 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -93,7 +93,7 @@ static inline u32 native_apic_msr_read(u32 reg)
93} 93}
94 94
95#ifndef CONFIG_X86_32 95#ifndef CONFIG_X86_32
96extern int x2apic, x2apic_preenabled; 96extern int x2apic;
97extern void check_x2apic(void); 97extern void check_x2apic(void);
98extern void enable_x2apic(void); 98extern void enable_x2apic(void);
99extern void enable_IR_x2apic(void); 99extern void enable_IR_x2apic(void);
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 7397911f8478..3a961bd9f619 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -97,8 +97,8 @@ __setup("apicpmtimer", setup_apicpmtimer);
97#ifdef HAVE_X2APIC 97#ifdef HAVE_X2APIC
98int x2apic; 98int x2apic;
99/* x2apic enabled before OS handover */ 99/* x2apic enabled before OS handover */
100int x2apic_preenabled; 100static int x2apic_preenabled;
101int disable_x2apic; 101static int disable_x2apic;
102static __init int setup_nox2apic(char *str) 102static __init int setup_nox2apic(char *str)
103{ 103{
104 disable_x2apic = 1; 104 disable_x2apic = 1;