[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20061006185824.GN352@slug>
Date: Fri, 6 Oct 2006 18:58:24 +0000
From: Frederik Deweerdt <deweerdt@...e.fr>
To: torvalds@...l.org
Cc: linux-kernel@...r.kernel.org
Subject: [patch 2.6.19-git] ixp4xxdefconfig arm fixes
Hi,
With the following patch, the ixp4xxdefconfig builds correctly.
I'll test some more configs if I get some time.
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@...il.com>
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index b094e3e..c03cab5 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -27,6 +27,7 @@ #include <linux/errno.h>
#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/kernel/irq/resend.c b/kernel/irq/resend.c
index 35f10f7..5bfeaed 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -38,7 +38,7 @@ static void resend_irqs(unsigned long ar
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();
}
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists