From 7980b788c3330fd512d11fd801b1004558ea8ada Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Wed, 7 Feb 2007 12:03:01 +1000 Subject: [PATCH] --- yaml --- r: 47327 b: refs/heads/master c: c051b01129560ea02ea2cebdf00db0721cc9a618 h: refs/heads/master i: 47325: 737d65a5a827bac1dafae4530cc813dd76b7cb1a 47323: e866e96a71d4a3a8e23d0244a1f380d68cced312 47319: 434ce6c82f625e001fb03628e0567536c5cb7bc9 47311: 87c1c700a4d3c3a8cb707050b1baf856871ba340 47295: dab60b40593b241dda681a49ab57d63551e180a5 v: v3 --- [refs] | 2 +- trunk/arch/m68knommu/platform/5307/timers.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 91e1bfc3efee..672e3b9b0baa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 459c6a9b8ee931e48f6af6637c10ec45521f0536 +refs/heads/master: c051b01129560ea02ea2cebdf00db0721cc9a618 diff --git a/trunk/arch/m68knommu/platform/5307/timers.c b/trunk/arch/m68knommu/platform/5307/timers.c index e5668af19789..87b112b363a6 100644 --- a/trunk/arch/m68knommu/platform/5307/timers.c +++ b/trunk/arch/m68knommu/platform/5307/timers.c @@ -62,7 +62,7 @@ void coldfire_tick(void) /***************************************************************************/ -void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) +void coldfire_timer_init(irq_handler_t handler) { __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); __raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR)); @@ -111,12 +111,13 @@ unsigned long coldfire_timer_offset(void) /* * Use the other timer to provide high accuracy profiling info. */ -void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs) +irqreturn_t coldfire_profile_tick(int irq, void *dummy) { /* Reset ColdFire timer2 */ __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER)); if (current->pid) profile_tick(CPU_PROFILING, regs); + return IRQ_HANDLED; } /***************************************************************************/