From f6f16c17ab7a2ecc3a0afd2fdadb614ef21ec2b0 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 6 Sep 2005 15:17:39 -0700
Subject: [PATCH] --- yaml --- r: 7391 b: refs/heads/master c:
 7f4bde9a3486cd7e70bedd2aff35b38667d50173 h: refs/heads/master i:   7389:
 03446e6a1849432b06d950fadf28590b400763a1   7387:
 722803f72e40dad07377638499cf81645f70427d   7383:
 32fb39ca7a978902166f657a6f7da9015b422bf6   7375:
 94eb5642432c11b54ec79e5be88a4b61e2820681   7359:
 b1984f21cdfa3d6090cc0157f3001cf5992c9ef4 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/i386/kernel/time.c | 5 ++---
 trunk/arch/sh/kernel/time.c   | 4 ++--
 trunk/arch/sh64/kernel/time.c | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index fedd70342299..828f00664060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2832e9366a1fcd6f76957a42157be041240f994e
+refs/heads/master: 7f4bde9a3486cd7e70bedd2aff35b38667d50173
diff --git a/trunk/arch/i386/kernel/time.c b/trunk/arch/i386/kernel/time.c
index b0c5ee2b3446..9b94d84a6c3b 100644
--- a/trunk/arch/i386/kernel/time.c
+++ b/trunk/arch/i386/kernel/time.c
@@ -252,8 +252,7 @@ EXPORT_SYMBOL(profile_pc);
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id,
-					struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_IO_APIC
 	if (timer_ack) {
@@ -307,7 +306,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 	cur_timer->mark_offset();
  
-	do_timer_interrupt(irq, NULL, regs);
+	do_timer_interrupt(irq, regs);
 
 	write_sequnlock(&xtime_lock);
 	return IRQ_HANDLED;
diff --git a/trunk/arch/sh/kernel/time.c b/trunk/arch/sh/kernel/time.c
index df7a9b9d4cbf..d5f5aedde0a3 100644
--- a/trunk/arch/sh/kernel/time.c
+++ b/trunk/arch/sh/kernel/time.c
@@ -234,7 +234,7 @@ static long last_rtc_update;
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
 	do_timer(regs);
 #ifndef CONFIG_SMP
@@ -285,7 +285,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	 * locally disabled. -arca
 	 */
 	write_seqlock(&xtime_lock);
-	do_timer_interrupt(irq, NULL, regs);
+	do_timer_interrupt(irq, regs);
 	write_sequnlock(&xtime_lock);
 
 	return IRQ_HANDLED;
diff --git a/trunk/arch/sh64/kernel/time.c b/trunk/arch/sh64/kernel/time.c
index 6c84da3efc73..926c6fc0619c 100644
--- a/trunk/arch/sh64/kernel/time.c
+++ b/trunk/arch/sh64/kernel/time.c
@@ -303,7 +303,7 @@ static long last_rtc_update = 0;
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
 	unsigned long long current_ctc;
 	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)
 	 * locally disabled. -arca
 	 */
 	write_lock(&xtime_lock);
-	do_timer_interrupt(irq, NULL, regs);
+	do_timer_interrupt(irq, regs);
 	write_unlock(&xtime_lock);
 
 	return IRQ_HANDLED;