diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-10-26 08:24:06 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-29 15:35:34 -0400 |
commit | 656db5061dc5758dc52cdbf26de5cd25aca82d7a (patch) | |
tree | 1b8c05f46f0ff14e32cad77d44081c3675ee52a7 /arch | |
parent | 0d0cc920de658126560938a01f12e6e8ca7d5bcd (diff) |
[MIPS] time: Cause platform definitions of plat_timer_setup to cause error.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/time.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 6c6849a8f136..27228f583dae 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
12 | * option) any later version. | 12 | * option) any later version. |
13 | */ | 13 | */ |
14 | #include <linux/bug.h> | ||
14 | #include <linux/clockchips.h> | 15 | #include <linux/clockchips.h> |
15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
@@ -115,10 +116,6 @@ EXPORT_SYMBOL(perf_irq); | |||
115 | * (only needed if you intended to use cpu counter as timer interrupt | 116 | * (only needed if you intended to use cpu counter as timer interrupt |
116 | * source) | 117 | * source) |
117 | * 2) calculate a couple of cached variables for later usage | 118 | * 2) calculate a couple of cached variables for later usage |
118 | * 3) plat_timer_setup() - | ||
119 | * a) (optional) over-write any choices made above by time_init(). | ||
120 | * b) machine specific code should setup the timer irqaction. | ||
121 | * c) enable the timer interrupt | ||
122 | */ | 119 | */ |
123 | 120 | ||
124 | unsigned int mips_hpt_frequency; | 121 | unsigned int mips_hpt_frequency; |
@@ -221,8 +218,18 @@ void __init __weak plat_time_init(void) | |||
221 | { | 218 | { |
222 | } | 219 | } |
223 | 220 | ||
224 | void __init __weak plat_timer_setup(struct irqaction *irq) | 221 | /* |
222 | * This function exists in order to cause an error due to a duplicate | ||
223 | * definition if platform code should have its own implementation. The hook | ||
224 | * to use instead is plat_time_init. plat_time_init does not receive the | ||
225 | * irqaction pointer argument anymore. This is because any function which | ||
226 | * initializes an interrupt timer now takes care of its own request_irq rsp. | ||
227 | * setup_irq calls and each clock_event_device should use its own | ||
228 | * struct irqrequest. | ||
229 | */ | ||
230 | void __init plat_timer_setup(struct irqaction *irq) | ||
225 | { | 231 | { |
232 | BUG(); | ||
226 | } | 233 | } |
227 | 234 | ||
228 | void __init time_init(void) | 235 | void __init time_init(void) |