2008-12-30 17:18:48

by Jaswinder Singh Rajput

[permalink] [raw]
Subject: [PATCH] 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 <[email protected]>
---
arch/x86/include/asm/apic.h | 1 -
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 e644bf6..ab1d51a 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -54,7 +54,6 @@ extern int disable_apic;
extern int is_vsmp_box(void);
extern void xapic_wait_icr_idle(void);
extern u32 safe_xapic_wait_icr_idle(void);
-extern u64 xapic_icr_read(void);
extern void xapic_icr_write(u32, u32);
extern int setup_profiling_timer(unsigned int);

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index cf1cc87..f53a057 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -227,7 +227,7 @@ void xapic_icr_write(u32 low, u32 id)
apic_write(APIC_ICR, low);
}

-u64 xapic_icr_read(void)
+static u64 xapic_icr_read(void)
{
u32 icr1, icr2;

@@ -267,7 +267,7 @@ void x2apic_icr_write(u32 low, u32 id)
wrmsrl(APIC_BASE_MSR + (APIC_ICR >> 4), ((__u64) id) << 32 | low);
}

-u64 x2apic_icr_read(void)
+static u64 x2apic_icr_read(void)
{
unsigned long val;

--
1.6.0.4