Skip to contentSkip to conversation

ixp4xxdefconfig arm fixes

PATCH New Frederik Deweerdt 1 participant 1 message Oct 6, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

arch/arm/kernel/time.c +2 -1
index b094e3e..c03cab5 100644
@@ -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);
kernel/irq/resend.c +1 -1
index 35f10f7..5bfeaed 100644
@@ -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();
 	}
 }