Commit a74edee6 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] fix return type of m68knommu timer handler to be irqreturn_t

Fix return type of m68knommu timer interrupt handler to be irqreturn_t.
parent c874bf6a
...@@ -60,7 +60,7 @@ static inline void do_profile (unsigned long pc) ...@@ -60,7 +60,7 @@ static inline void do_profile (unsigned long pc)
* timer_interrupt() needs to keep up the real-time clock, * timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick * as well as call the "do_timer()" routine every clocktick
*/ */
static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs) static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
{ {
/* last time the cmos clock got updated */ /* last time the cmos clock got updated */
static long last_rtc_update=0; static long last_rtc_update=0;
...@@ -115,6 +115,7 @@ static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs) ...@@ -115,6 +115,7 @@ static void timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
#endif /* CONFIG_HEARTBEAT */ #endif /* CONFIG_HEARTBEAT */
write_sequnlock(&xtime_lock); write_sequnlock(&xtime_lock);
return(IRQ_HANDLED);
} }
void time_init(void) void time_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment