aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2007-02-06 20:35:29 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 13:45:32 -0500
commit1f95e49aae68794c4dc0d92fea8b4967dd49ae53 (patch)
treed58d8f35aa25c3ba317644269cc1d7f1a574e3c4 /arch/m68knommu
parent64106104dd2d4a6280777e88c1cbf9f7a52c30bd (diff)
[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>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/kernel/time.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index 9226264abf1a..11ea217ed5cf 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -23,6 +23,7 @@
23 23
24#include <asm/machdep.h> 24#include <asm/machdep.h>
25#include <asm/io.h> 25#include <asm/io.h>
26#include <asm/irq_regs.h>
26 27
27#define TICK_SIZE (tick_nsec / 1000) 28#define TICK_SIZE (tick_nsec / 1000)
28 29
@@ -38,7 +39,7 @@ static inline int set_rtc_mmss(unsigned long nowtime)
38 * timer_interrupt() needs to keep up the real-time clock, 39 * timer_interrupt() needs to keep up the real-time clock,
39 * as well as call the "do_timer()" routine every clocktick 40 * as well as call the "do_timer()" routine every clocktick
40 */ 41 */
41static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs) 42static irqreturn_t timer_interrupt(int irq, void *dummy)
42{ 43{
43 /* last time the cmos clock got updated */ 44 /* last time the cmos clock got updated */
44 static long last_rtc_update=0; 45 static long last_rtc_update=0;
@@ -51,7 +52,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
51 52
52 do_timer(1); 53 do_timer(1);
53#ifndef CONFIG_SMP 54#ifndef CONFIG_SMP
54 update_process_times(user_mode(regs)); 55 update_process_times(user_mode(get_irq_regs()));
55#endif 56#endif
56 if (current->pid) 57 if (current->pid)
57 profile_tick(CPU_PROFILING); 58 profile_tick(CPU_PROFILING);