diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-04-29 03:59:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:06:03 -0400 |
commit | 7d195a5409120277b800c42e846ee29cc667b777 (patch) | |
tree | 18d6f9780421788289ddf143bd0c1061bd1d4c0e | |
parent | 175a06ae300188af8a61db68a78e1af44dc7d44f (diff) |
proper extern for late_time_init
Add a proper extern for late_time_init in include/linux/init.h
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/setup.c | 3 | ||||
-rw-r--r-- | arch/ppc/platforms/sbc82xx.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/time.c | 3 | ||||
-rw-r--r-- | arch/x86/kernel/time_32.c | 1 | ||||
-rw-r--r-- | include/asm-x86/time.h | 1 | ||||
-rw-r--r-- | include/linux/init.h | 2 |
6 files changed, 3 insertions, 9 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c index 855977ca51cd..6537d90a25bb 100644 --- a/arch/mips/pmc-sierra/yosemite/setup.c +++ b/arch/mips/pmc-sierra/yosemite/setup.c | |||
@@ -143,9 +143,6 @@ void __init plat_time_init(void) | |||
143 | mips_hpt_frequency = 33000000 * 3 * 5; | 143 | mips_hpt_frequency = 33000000 * 3 * 5; |
144 | } | 144 | } |
145 | 145 | ||
146 | /* No other usable initialization hook than this ... */ | ||
147 | extern void (*late_time_init)(void); | ||
148 | |||
149 | unsigned long ocd_base; | 146 | unsigned long ocd_base; |
150 | 147 | ||
151 | EXPORT_SYMBOL(ocd_base); | 148 | EXPORT_SYMBOL(ocd_base); |
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c index 0df6aacb8237..24f6e0694ac1 100644 --- a/arch/ppc/platforms/sbc82xx.c +++ b/arch/ppc/platforms/sbc82xx.c | |||
@@ -30,8 +30,6 @@ static void (*callback_init_IRQ)(void); | |||
30 | 30 | ||
31 | extern unsigned char __res[sizeof(bd_t)]; | 31 | extern unsigned char __res[sizeof(bd_t)]; |
32 | 32 | ||
33 | extern void (*late_time_init)(void); | ||
34 | |||
35 | #ifdef CONFIG_GEN_RTC | 33 | #ifdef CONFIG_GEN_RTC |
36 | TODC_ALLOC(); | 34 | TODC_ALLOC(); |
37 | 35 | ||
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index e066e84493b1..0d0cea2ac98d 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -4,6 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <linux/clockchips.h> | 6 | #include <linux/clockchips.h> |
7 | #include <linux/init.h> | ||
7 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
8 | #include <linux/jiffies.h> | 9 | #include <linux/jiffies.h> |
9 | #include <linux/threads.h> | 10 | #include <linux/threads.h> |
@@ -109,8 +110,6 @@ static void __init setup_itimer(void) | |||
109 | clockevents_register_device(&itimer_clockevent); | 110 | clockevents_register_device(&itimer_clockevent); |
110 | } | 111 | } |
111 | 112 | ||
112 | extern void (*late_time_init)(void); | ||
113 | |||
114 | void __init time_init(void) | 113 | void __init time_init(void) |
115 | { | 114 | { |
116 | long long nsecs; | 115 | long long nsecs; |
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 1a89e93f3f1c..2ff21f398934 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
@@ -115,7 +115,6 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
115 | return IRQ_HANDLED; | 115 | return IRQ_HANDLED; |
116 | } | 116 | } |
117 | 117 | ||
118 | extern void (*late_time_init)(void); | ||
119 | /* Duplicate of time_init() below, with hpet_enable part added */ | 118 | /* Duplicate of time_init() below, with hpet_enable part added */ |
120 | void __init hpet_time_init(void) | 119 | void __init hpet_time_init(void) |
121 | { | 120 | { |
diff --git a/include/asm-x86/time.h b/include/asm-x86/time.h index 68779b048a3e..bce72d7a958c 100644 --- a/include/asm-x86/time.h +++ b/include/asm-x86/time.h | |||
@@ -1,7 +1,6 @@ | |||
1 | #ifndef _ASMX86_TIME_H | 1 | #ifndef _ASMX86_TIME_H |
2 | #define _ASMX86_TIME_H | 2 | #define _ASMX86_TIME_H |
3 | 3 | ||
4 | extern void (*late_time_init)(void); | ||
5 | extern void hpet_time_init(void); | 4 | extern void hpet_time_init(void); |
6 | 5 | ||
7 | #include <asm/mc146818rtc.h> | 6 | #include <asm/mc146818rtc.h> |
diff --git a/include/linux/init.h b/include/linux/init.h index fb58c0493cf2..21d658cdfa27 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -147,6 +147,8 @@ extern unsigned int reset_devices; | |||
147 | void setup_arch(char **); | 147 | void setup_arch(char **); |
148 | void prepare_namespace(void); | 148 | void prepare_namespace(void); |
149 | 149 | ||
150 | extern void (*late_time_init)(void); | ||
151 | |||
150 | #endif | 152 | #endif |
151 | 153 | ||
152 | #ifndef MODULE | 154 | #ifndef MODULE |