diff options
| -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(); } } |
