[PATCH] m68knommu: remove regs arg from coldfire timer interrupt
authorGreg Ungerer <gerg@snapgear.com>
Wed, 7 Feb 2007 01:35:29 +0000 (11:35 +1000)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Feb 2007 18:45:32 +0000 (10:45 -0800)
Fix coldfire kernel timer to remove regs arg.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/m68knommu/kernel/time.c

index 9226264abf1ab610846d9df98afa4a9c9dfca91d..11ea217ed5cfa153f6d2b8e550ea1a23eee5fea2 100644 (file)
@@ -23,6 +23,7 @@
 
 #include <asm/machdep.h>
 #include <asm/io.h>
+#include <asm/irq_regs.h>
 
 #define        TICK_SIZE (tick_nsec / 1000)
 
@@ -38,7 +39,7 @@ static inline int set_rtc_mmss(unsigned long nowtime)
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
+static irqreturn_t timer_interrupt(int irq, void *dummy)
 {
        /* last time the cmos clock got updated */
        static long last_rtc_update=0;
@@ -51,7 +52,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
 
        do_timer(1);
 #ifndef CONFIG_SMP
-       update_process_times(user_mode(regs));
+       update_process_times(user_mode(get_irq_regs()));
 #endif
        if (current->pid)
                profile_tick(CPU_PROFILING);