aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-06-23 02:04:17 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:42:56 -0700
commita0b4da91f4c5710b9c20219a19e905145647b48b (patch)
treebd2a6e10d0194601548beaa0a2810fc994ca1d0f
parentc22ce143d15eb288543fe9873e1c5ac1c01b69a1 (diff)
[PATCH] arch/i386/kernel/apic.c: make modern_apic() static
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/apic.c2
-rw-r--r--include/asm-i386/apic.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 3d4b2f3d116..261796ff83c 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -62,7 +62,7 @@ int apic_verbosity;
static void apic_pm_activate(void);
-int modern_apic(void)
+static int modern_apic(void)
{
unsigned int lvr, version;
/* AMD systems use old APIC versions, so check the CPU */
diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
index cc9b940fb7e..1d8362cb2c5 100644
--- a/include/asm-i386/apic.h
+++ b/include/asm-i386/apic.h
@@ -138,8 +138,6 @@ void switch_ipi_to_APIC_timer(void *cpumask);
extern int timer_over_8254;
-extern int modern_apic(void);
-
#else /* !CONFIG_X86_LOCAL_APIC */
static inline void lapic_shutdown(void) { }