aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68knommu/platform/5307/timers.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index e5668af19789..87b112b363a6 100644
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -62,7 +62,7 @@ void coldfire_tick(void)
62 62
63/***************************************************************************/ 63/***************************************************************************/
64 64
65void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) 65void coldfire_timer_init(irq_handler_t handler)
66{ 66{
67 __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR)); 67 __raw_writew(MCFTIMER_TMR_DISABLE, TA(MCFTIMER_TMR));
68 __raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR)); 68 __raw_writetrr(((MCF_BUSCLK / 16) / HZ), TA(MCFTIMER_TRR));
@@ -111,12 +111,13 @@ unsigned long coldfire_timer_offset(void)
111/* 111/*
112 * Use the other timer to provide high accuracy profiling info. 112 * Use the other timer to provide high accuracy profiling info.
113 */ 113 */
114void coldfire_profile_tick(int irq, void *dummy, struct pt_regs *regs) 114irqreturn_t coldfire_profile_tick(int irq, void *dummy)
115{ 115{
116 /* Reset ColdFire timer2 */ 116 /* Reset ColdFire timer2 */
117 __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER)); 117 __raw_writeb(MCFTIMER_TER_CAP | MCFTIMER_TER_REF, PA(MCFTIMER_TER));
118 if (current->pid) 118 if (current->pid)
119 profile_tick(CPU_PROFILING, regs); 119 profile_tick(CPU_PROFILING, regs);
120 return IRQ_HANDLED;
120} 121}
121 122
122/***************************************************************************/ 123/***************************************************************************/