diff options
author | Jaswinder Singh Rajput <jaswinder@infradead.org> | 2008-12-30 12:16:36 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-12-30 16:31:28 -0500 |
commit | ec8c842a524888fdcccece337d91798e3e8af880 (patch) | |
tree | b1296c9af3be9bc75c67ba9812e84d10d7811c25 | |
parent | c62e9d56ea90ef94f9708ce3f11860c20fa5e135 (diff) |
x86: apic.c: xapic_icr_read and x2apic_icr_read should be static
Impact: cleanup, reduce kernel size a bit, avoid sparse warning
Fixes sparse warning:
arch/x86/kernel/apic.c:270:5: warning: symbol 'x2apic_icr_read' was not declared. Should it be static?
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | arch/x86/include/asm/apic.h | 1 | ||||
-rw-r--r-- | arch/x86/kernel/apic.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index e644bf6f90dc..ab1d51a8855e 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -54,7 +54,6 @@ extern int disable_apic; | |||
54 | extern int is_vsmp_box(void); | 54 | extern int is_vsmp_box(void); |
55 | extern void xapic_wait_icr_idle(void); | 55 | extern void xapic_wait_icr_idle(void); |
56 | extern u32 safe_xapic_wait_icr_idle(void); | 56 | extern u32 safe_xapic_wait_icr_idle(void); |
57 | extern u64 xapic_icr_read(void); | ||
58 | extern void xapic_icr_write(u32, u32); | 57 | extern void xapic_icr_write(u32, u32); |
59 | extern int setup_profiling_timer(unsigned int); | 58 | extern int setup_profiling_timer(unsigned int); |
60 | 59 | ||
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index c67722f010bd..66198cbe464d 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -228,7 +228,7 @@ void xapic_icr_write(u32 low, u32 id) | |||
228 | apic_write(APIC_ICR, low); | 228 | apic_write(APIC_ICR, low); |
229 | } | 229 | } |
230 | 230 | ||
231 | u64 xapic_icr_read(void) | 231 | static u64 xapic_icr_read(void) |
232 | { | 232 | { |
233 | u32 icr1, icr2; | 233 | u32 icr1, icr2; |
234 | 234 | ||
@@ -268,7 +268,7 @@ void x2apic_icr_write(u32 low, u32 id) | |||
268 | wrmsrl(APIC_BASE_MSR + (APIC_ICR >> 4), ((__u64) id) << 32 | low); | 268 | wrmsrl(APIC_BASE_MSR + (APIC_ICR >> 4), ((__u64) id) << 32 | low); |
269 | } | 269 | } |
270 | 270 | ||
271 | u64 x2apic_icr_read(void) | 271 | static u64 x2apic_icr_read(void) |
272 | { | 272 | { |
273 | unsigned long val; | 273 | unsigned long val; |
274 | 274 | ||