diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2012-05-23 13:27:18 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2012-06-12 11:58:27 +1000 |
| commit | dc5588ae3c597006095926c25634408257457a8f (patch) | |
| tree | 40c6a345db60d89bb6540ef66f659a986cd48c01 | |
| parent | b13b3f51ff7bec19ac1ba66e3623bfaa484af124 (diff) | |
| download | linux-3.10-dc5588ae3c597006095926c25634408257457a8f.tar.gz linux-3.10-dc5588ae3c597006095926c25634408257457a8f.tar.bz2 linux-3.10-dc5588ae3c597006095926c25634408257457a8f.zip | |
m68knommu: fix 68328 local setting of timer interrupt handler
Compiling for 68328 based targets fails with:
arch/m68k/platform/68328/timers.c: In function ‘hw_tick’:
arch/m68k/platform/68328/timers.c:65:2: error: implicit declaration of function ‘arch_timer_interrupt’
arch/m68k/platform/68328/timers.c: At top level:
arch/m68k/platform/68328/timers.c:102:6: error: conflicting types for ‘hw_timer_init’
arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here
Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
So process and call the "handler" arg that is now passed into that
hw_timer_init() function.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/platform/68328/timers.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/m68k/platform/68328/timers.c b/arch/m68k/platform/68328/timers.c index c801c172b82..f4dc9b29560 100644 --- a/arch/m68k/platform/68328/timers.c +++ b/arch/m68k/platform/68328/timers.c @@ -53,6 +53,7 @@ #endif static u32 m68328_tick_cnt; +static irq_handler_t timer_interrupt; /***************************************************************************/ @@ -62,7 +63,7 @@ static irqreturn_t hw_tick(int irq, void *dummy) TSTAT &= 0; m68328_tick_cnt += TICKS_PER_JIFFY; - return arch_timer_interrupt(irq, dummy); + return timer_interrupt(irq, dummy); } /***************************************************************************/ @@ -99,7 +100,7 @@ static struct clocksource m68328_clk = { /***************************************************************************/ -void hw_timer_init(void) +void hw_timer_init(irq_handler_t handler) { /* disable timer 1 */ TCTL = 0; @@ -115,6 +116,7 @@ void hw_timer_init(void) /* Enable timer 1 */ TCTL |= TCTL_TEN; clocksource_register_hz(&m68328_clk, TICKS_PER_JIFFY*HZ); + timer_interrupt = handler; } /***************************************************************************/ |