From a516a149a42667ee3ac8711a6fcf01ae3bc066e6 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 23 May 2012 13:27:18 +1000 Subject: [PATCH] --- yaml --- r: 310663 b: refs/heads/master c: dc5588ae3c597006095926c25634408257457a8f h: refs/heads/master i: 310661: b10f337fe76843d29be8415ff2e2dcf172969772 310659: e8165f3aa257b50849eeb961bcde426282743725 310655: 7d3a195024652bf2f6e3c2e35a860efd912f8be3 v: v3 --- [refs] | 2 +- trunk/arch/m68k/platform/68328/timers.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1c1db8792479..2ac5f37f2d51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b13b3f51ff7bec19ac1ba66e3623bfaa484af124 +refs/heads/master: dc5588ae3c597006095926c25634408257457a8f diff --git a/trunk/arch/m68k/platform/68328/timers.c b/trunk/arch/m68k/platform/68328/timers.c index c801c172b822..f4dc9b295609 100644 --- a/trunk/arch/m68k/platform/68328/timers.c +++ b/trunk/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; } /***************************************************************************/