diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-02-07 02:35:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 19:45:32 +0100 |
| commit | 1f95e49aae68794c4dc0d92fea8b4967dd49ae53 (patch) | |
| tree | d58d8f35aa25c3ba317644269cc1d7f1a574e3c4 /arch/m68knommu/kernel/time.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| download | linux-1f95e49aae68794c4dc0d92fea8b4967dd49ae53.tar.xz linux-1f95e49aae68794c4dc0d92fea8b4967dd49ae53.zip | |
[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/kernel/time.c')
| -rw-r--r-- | arch/m68knommu/kernel/time.c | 5 |
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 @@ #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); |