aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/frv/kernel/time.c')
-rw-r--r--arch/frv/kernel/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index 44a9aebc4f5a..ed588d73d7d8 100644
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -40,7 +40,7 @@ unsigned long __nongprelbss __dsu_clock_speed_HZ;
40unsigned long __nongprelbss __serial_clock_speed_HZ; 40unsigned long __nongprelbss __serial_clock_speed_HZ;
41unsigned long __delay_loops_MHz; 41unsigned long __delay_loops_MHz;
42 42
43static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs *regs); 43static irqreturn_t timer_interrupt(int irq, void *dummy);
44 44
45static struct irqaction timer_irq = { 45static struct irqaction timer_irq = {
46 timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL 46 timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL
@@ -55,7 +55,7 @@ static inline int set_rtc_mmss(unsigned long nowtime)
55 * timer_interrupt() needs to keep up the real-time clock, 55 * timer_interrupt() needs to keep up the real-time clock,
56 * as well as call the "do_timer()" routine every clocktick 56 * as well as call the "do_timer()" routine every clocktick
57 */ 57 */
58static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs) 58static irqreturn_t timer_interrupt(int irq, void *dummy)
59{ 59{
60 /* last time the cmos clock got updated */ 60 /* last time the cmos clock got updated */
61 static long last_rtc_update = 0; 61 static long last_rtc_update = 0;
@@ -70,8 +70,8 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
70 write_seqlock(&xtime_lock); 70 write_seqlock(&xtime_lock);
71 71
72 do_timer(1); 72 do_timer(1);
73 update_process_times(user_mode(regs)); 73 update_process_times(user_mode(get_irq_regs()));
74 profile_tick(CPU_PROFILING, regs); 74 profile_tick(CPU_PROFILING);
75 75
76 /* 76 /*
77 * If we have an externally synchronized Linux clock, then update 77 * If we have an externally synchronized Linux clock, then update