diff options
| author | Frederik Deweerdt <deweerdt@free.fr> | 2006-10-06 18:58:24 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 12:11:08 -0700 |
| commit | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (patch) | |
| tree | 327b25cecd21d97097b1249fe73a5c9ff2a6bcc6 | |
| parent | b7696ee3c050a76a6cebccdbadfc93896b336e44 (diff) | |
| download | linux-stable-e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67.tar.gz linux-stable-e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67.tar.bz2 linux-stable-e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67.zip | |
[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>
| -rw-r--r-- | arch/arm/kernel/time.c | 3 | ||||
| -rw-r--r-- | 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 b094e3e81981..c03cab5c4c79 100644 --- 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 35f10f7ff94a..5bfeaed7e487 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(); } } |