From e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 Mon Sep 17 00:00:00 2001 From: Frederik Deweerdt Date: Fri, 6 Oct 2006 18:58:24 +0000 Subject: [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 Signed-off-by: Linus Torvalds --- arch/arm/kernel/time.c | 3 ++- kernel/irq/resend.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index b094e3e8198..c03cab5c4c7 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -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 35f10f7ff94..5bfeaed7e48 100644 --- 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(); } } -- cgit v1.2.3