1 files changed, 5 insertions, 1 deletions

diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index abd954fb7ba0..7e7f32771ae1 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -43,6 +43,9 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *evdev = dev_id;
 
+        if (unlikely(!(intc_get_pending(0) & 1)))
+                return IRQ_NONE;
+
         /*
          * Disable the interrupt until the clockevent subsystem
          * reprograms it.
@@ -55,7 +58,8 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 
 static struct irqaction timer_irqaction = {
         .handler        = timer_interrupt,
-        .flags          = IRQF_TIMER | IRQF_DISABLED,
+        /* Oprofile uses the same irq as the timer, so allow it to be shared */
+        .flags          = IRQF_TIMER | IRQF_DISABLED | IRQF_SHARED,
         .name           = "avr32_comparator",
 };