aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/kernel/time.c5
-rw-r--r--arch/sh/kernel/time.c4
-rw-r--r--arch/sh64/kernel/time.c4
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index b0c5ee2b3446..9b94d84a6c3b 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -252,8 +252,7 @@ EXPORT_SYMBOL(profile_pc);
252 * timer_interrupt() needs to keep up the real-time clock, 252 * timer_interrupt() needs to keep up the real-time clock,
253 * as well as call the "do_timer()" routine every clocktick 253 * as well as call the "do_timer()" routine every clocktick
254 */ 254 */
255static inline void do_timer_interrupt(int irq, void *dev_id, 255static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
256 struct pt_regs *regs)
257{ 256{
258#ifdef CONFIG_X86_IO_APIC 257#ifdef CONFIG_X86_IO_APIC
259 if (timer_ack) { 258 if (timer_ack) {
@@ -307,7 +306,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
307 306
308 cur_timer->mark_offset(); 307 cur_timer->mark_offset();
309 308
310 do_timer_interrupt(irq, NULL, regs); 309 do_timer_interrupt(irq, regs);
311 310
312 write_sequnlock(&xtime_lock); 311 write_sequnlock(&xtime_lock);
313 return IRQ_HANDLED; 312 return IRQ_HANDLED;
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index df7a9b9d4cbf..d5f5aedde0a3 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -234,7 +234,7 @@ static long last_rtc_update;
234 * timer_interrupt() needs to keep up the real-time clock, 234 * timer_interrupt() needs to keep up the real-time clock,
235 * as well as call the "do_timer()" routine every clocktick 235 * as well as call the "do_timer()" routine every clocktick
236 */ 236 */
237static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 237static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
238{ 238{
239 do_timer(regs); 239 do_timer(regs);
240#ifndef CONFIG_SMP 240#ifndef CONFIG_SMP
@@ -285,7 +285,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
285 * locally disabled. -arca 285 * locally disabled. -arca
286 */ 286 */
287 write_seqlock(&xtime_lock); 287 write_seqlock(&xtime_lock);
288 do_timer_interrupt(irq, NULL, regs); 288 do_timer_interrupt(irq, regs);
289 write_sequnlock(&xtime_lock); 289 write_sequnlock(&xtime_lock);
290 290
291 return IRQ_HANDLED; 291 return IRQ_HANDLED;
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c
index 6c84da3efc73..926c6fc0619c 100644
--- a/arch/sh64/kernel/time.c
+++ b/arch/sh64/kernel/time.c
@@ -303,7 +303,7 @@ static long last_rtc_update = 0;
303 * timer_interrupt() needs to keep up the real-time clock, 303 * timer_interrupt() needs to keep up the real-time clock,
304 * as well as call the "do_timer()" routine every clocktick 304 * as well as call the "do_timer()" routine every clocktick
305 */ 305 */
306static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 306static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
307{ 307{
308 unsigned long long current_ctc; 308 unsigned long long current_ctc;
309 asm ("getcon cr62, %0" : "=r" (current_ctc)); 309 asm ("getcon cr62, %0" : "=r" (current_ctc));
@@ -361,7 +361,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
361 * locally disabled. -arca 361 * locally disabled. -arca
362 */ 362 */
363 write_lock(&xtime_lock); 363 write_lock(&xtime_lock);
364 do_timer_interrupt(irq, NULL, regs); 364 do_timer_interrupt(irq, regs);
365 write_unlock(&xtime_lock); 365 write_unlock(&xtime_lock);
366 366
367 return IRQ_HANDLED; 367 return IRQ_HANDLED;