aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kernel/time.c3
-rw-r--r--kernel/irq/resend.c2
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 @@
27#include <linux/profile.h> 27#include <linux/profile.h>
28#include <linux/sysdev.h> 28#include <linux/sysdev.h>
29#include <linux/timer.h> 29#include <linux/timer.h>
30#include <linux/irq.h>
30 31
31#include <asm/leds.h> 32#include <asm/leds.h>
32#include <asm/thread_info.h> 33#include <asm/thread_info.h>
@@ -327,7 +328,7 @@ EXPORT_SYMBOL(restore_time_delta);
327void timer_tick(void) 328void timer_tick(void)
328{ 329{
329 struct pt_regs *regs = get_irq_regs(); 330 struct pt_regs *regs = get_irq_regs();
330 profile_tick(CPU_PROFILING, regs); 331 profile_tick(CPU_PROFILING);
331 do_leds(); 332 do_leds();
332 do_set_rtc(); 333 do_set_rtc();
333 do_timer(1); 334 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)
38 clear_bit(irq, irqs_resend); 38 clear_bit(irq, irqs_resend);
39 desc = irq_desc + irq; 39 desc = irq_desc + irq;
40 local_irq_disable(); 40 local_irq_disable();
41 desc->handle_irq(irq, desc, NULL); 41 desc->handle_irq(irq, desc);
42 local_irq_enable(); 42 local_irq_enable();
43 } 43 }
44} 44}