[PATCH] ixp4xxdefconfig arm fixes

With the following patch, the ixp4xxdefconfig builds correctly.  I'll
test some more configs if I get some time.

Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index b094e3e81981c72148b2fd23736df66b633b6186..c03cab5c4c798e763108480de6382312f41ba5ca 100644 (file)
--- a/arch/arm/kernel/time.c
+++ b/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/kernel/irq/resend.c b/kernel/irq/resend.c
index 35f10f7ff94aec43957fa71e7e97cf8f67b22b73..5bfeaed7e4872850049d40aef740d24b983adebf 100644 (file)
--- a/kernel/irq/resend.c
+++ b/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();
        }
 }