aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/au1000/common/time.c6
-rw-r--r--arch/mips/gt64120/common/time.c2
-rw-r--r--arch/mips/kernel/time.c2
-rw-r--r--arch/mips/momentum/ocelot_g/gt-irq.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-timer.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 7fbea1bf7b48..0a067f3113a5 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -96,7 +96,7 @@ void mips_timer_interrupt(struct pt_regs *regs)
96 timerlo = count; 96 timerlo = count;
97 97
98 kstat_this_cpu.irqs[irq]++; 98 kstat_this_cpu.irqs[irq]++;
99 do_timer(regs); 99 do_timer(1);
100#ifndef CONFIG_SMP 100#ifndef CONFIG_SMP
101 update_process_times(user_mode(regs)); 101 update_process_times(user_mode(regs));
102#endif 102#endif
@@ -137,7 +137,7 @@ irqreturn_t counter0_irq(int irq, void *dev_id, struct pt_regs *regs)
137 } 137 }
138 138
139 while (time_elapsed > 0) { 139 while (time_elapsed > 0) {
140 do_timer(regs); 140 do_timer(1);
141#ifndef CONFIG_SMP 141#ifndef CONFIG_SMP
142 update_process_times(user_mode(regs)); 142 update_process_times(user_mode(regs));
143#endif 143#endif
@@ -156,7 +156,7 @@ irqreturn_t counter0_irq(int irq, void *dev_id, struct pt_regs *regs)
156 156
157 if (jiffie_drift >= 999) { 157 if (jiffie_drift >= 999) {
158 jiffie_drift -= 999; 158 jiffie_drift -= 999;
159 do_timer(regs); /* increment jiffies by one */ 159 do_timer(1); /* increment jiffies by one */
160#ifndef CONFIG_SMP 160#ifndef CONFIG_SMP
161 update_process_times(user_mode(regs)); 161 update_process_times(user_mode(regs));
162#endif 162#endif
diff --git a/arch/mips/gt64120/common/time.c b/arch/mips/gt64120/common/time.c
index d837b26fbe51..7feca49350d1 100644
--- a/arch/mips/gt64120/common/time.c
+++ b/arch/mips/gt64120/common/time.c
@@ -34,7 +34,7 @@ static void gt64120_irq(int irq, void *dev_id, struct pt_regs *regs)
34 if (irq_src & 0x00000800) { /* Check for timer interrupt */ 34 if (irq_src & 0x00000800) { /* Check for timer interrupt */
35 handled = 1; 35 handled = 1;
36 irq_src &= ~0x00000800; 36 irq_src &= ~0x00000800;
37 do_timer(regs); 37 do_timer(1);
38#ifndef CONFIG_SMP 38#ifndef CONFIG_SMP
39 update_process_times(user_mode(regs)); 39 update_process_times(user_mode(regs));
40#endif 40#endif
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 170cb67f4ede..6ab8d975a974 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -434,7 +434,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
434 /* 434 /*
435 * call the generic timer interrupt handling 435 * call the generic timer interrupt handling
436 */ 436 */
437 do_timer(regs); 437 do_timer(1);
438 438
439 /* 439 /*
440 * If we have an externally synchronized Linux clock, then update 440 * If we have an externally synchronized Linux clock, then update
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c
index 9fb2493fff02..6cd87cf0195a 100644
--- a/arch/mips/momentum/ocelot_g/gt-irq.c
+++ b/arch/mips/momentum/ocelot_g/gt-irq.c
@@ -133,7 +133,7 @@ static irqreturn_t gt64240_p0int_irq(int irq, void *dev, struct pt_regs *regs)
133 MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_CAUSE, 0x0); 133 MV_WRITE(TIMER_COUNTER_0_3_INTERRUPT_CAUSE, 0x0);
134 134
135 /* handle the timer call */ 135 /* handle the timer call */
136 do_timer(regs); 136 do_timer(1);
137#ifndef CONFIG_SMP 137#ifndef CONFIG_SMP
138 update_process_times(user_mode(regs)); 138 update_process_times(user_mode(regs));
139#endif 139#endif
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index b029ba79c27a..c62a3a9ef867 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -111,7 +111,7 @@ again:
111 kstat_this_cpu.irqs[irq]++; /* kstat only for bootcpu? */ 111 kstat_this_cpu.irqs[irq]++; /* kstat only for bootcpu? */
112 112
113 if (cpu == 0) 113 if (cpu == 0)
114 do_timer(regs); 114 do_timer(1);
115 115
116 update_process_times(user_mode(regs)); 116 update_process_times(user_mode(regs));
117 117