From f375e8d724c43d7b8aa1397c6485f9d38b4303fd Mon Sep 17 00:00:00 2001
From: Frederik Deweerdt <deweerdt@free.fr>
Date: Fri, 6 Oct 2006 18:58:24 +0000
Subject: [PATCH] --- yaml --- r: 39078 b: refs/heads/master c:
 e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/kernel/time.c | 3 ++-
 trunk/kernel/irq/resend.c    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 68dd51d90cc8..ace00bcb3cae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7696ee3c050a76a6cebccdbadfc93896b336e44
+refs/heads/master: e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67
diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c
index b094e3e81981..c03cab5c4c79 100644
--- a/trunk/arch/arm/kernel/time.c
+++ b/trunk/arch/arm/kernel/time.c
@@ -27,6 +27,7 @@
 #include <linux/profile.h>
 #include <linux/sysdev.h>
 #include <linux/timer.h>
+#include <linux/irq.h>
 
 #include <asm/leds.h>
 #include <asm/thread_info.h>
@@ -327,7 +328,7 @@ EXPORT_SYMBOL(restore_time_delta);
 void timer_tick(void)
 {
 	struct pt_regs *regs = get_irq_regs();
-	profile_tick(CPU_PROFILING, regs);
+	profile_tick(CPU_PROFILING);
 	do_leds();
 	do_set_rtc();
 	do_timer(1);
diff --git a/trunk/kernel/irq/resend.c b/trunk/kernel/irq/resend.c
index 35f10f7ff94a..5bfeaed7e487 100644
--- a/trunk/kernel/irq/resend.c
+++ b/trunk/kernel/irq/resend.c
@@ -38,7 +38,7 @@ static void resend_irqs(unsigned long arg)
 		clear_bit(irq, irqs_resend);
 		desc = irq_desc + irq;
 		local_irq_disable();
-		desc->handle_irq(irq, desc, NULL);
+		desc->handle_irq(irq, desc);
 		local_irq_enable();
 	}
 }