From: Greg Ungerer <gerg@snapgear.com>
Date: Wed, 7 Feb 2007 01:35:29 +0000 (+1000)
Subject: [PATCH] m68knommu: remove regs arg from coldfire timer interrupt
X-Git-Tag: v2.6.21-rc1~83^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1f95e49aae68794c4dc0d92fea8b4967dd49ae53;p=linux-2.6-omap-h63xx.git

[PATCH] m68knommu: remove regs arg from coldfire timer interrupt

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>
---

diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index 9226264abf1..11ea217ed5c 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -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);