2008-12-23 16:24:31

by Jaswinder Singh Rajput

Subject: [PATCH] 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 <[email protected]>
---
arch/x86/include/asm/apic.h | 2 +-
arch/x86/kernel/apic.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 25caa07..e644bf6 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)
}

#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);
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index a477c0f..cf1cc87 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -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;
--
1.5.5.1

2008-12-27 10:30:58

by Ingo Molnar

Subject: Re: [PATCH] x86: apic.c x2apic_preenabled and disable_x2apic should be static

* Jaswinder Singh <[email protected]> wrote:

> 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 <[email protected]>
> ---
> 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