diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-23 05:04:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:42:56 -0400 |
commit | a0b4da91f4c5710b9c20219a19e905145647b48b (patch) | |
tree | bd2a6e10d0194601548beaa0a2810fc994ca1d0f | |
parent | c22ce143d15eb288543fe9873e1c5ac1c01b69a1 (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.c | 2 | ||||
-rw-r--r-- | include/asm-i386/apic.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 3d4b2f3d116a..261796ff83c3 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
@@ -62,7 +62,7 @@ int apic_verbosity; | |||
62 | 62 | ||
63 | static void apic_pm_activate(void); | 63 | static void apic_pm_activate(void); |
64 | 64 | ||
65 | int modern_apic(void) | 65 | static int modern_apic(void) |
66 | { | 66 | { |
67 | unsigned int lvr, version; | 67 | unsigned int lvr, version; |
68 | /* AMD systems use old APIC versions, so check the CPU */ | 68 | /* 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 cc9b940fb7e8..1d8362cb2c5d 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); | |||
138 | 138 | ||
139 | extern int timer_over_8254; | 139 | extern int timer_over_8254; |
140 | 140 | ||
141 | extern int modern_apic(void); | ||
142 | |||
143 | #else /* !CONFIG_X86_LOCAL_APIC */ | 141 | #else /* !CONFIG_X86_LOCAL_APIC */ |
144 | static inline void lapic_shutdown(void) { } | 142 | static inline void lapic_shutdown(void) { } |
145 | 143 | ||