---

yaml --- r: 263561 b: refs/heads/master c: 995b528 h: refs/heads/master i: 263559: 8fc0448 v: v3
git-mirror · Aug 19, 2011 · f9e9fc6 · f9e9fc6
1 parent 9bc9545
commit f9e9fc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f98d429d7a7ff43d6e7c9bab239223f44a85264e
+refs/heads/master: 995b528ad25968472742c50fe964d44fac2b857a
diff --git a/trunk/arch/arm/plat-samsung/irq-vic-timer.c b/trunk/arch/arm/plat-samsung/irq-vic-timer.c
@@ -22,9 +22,14 @@
 #include <plat/irq-vic-timer.h>
 #include <plat/regs-timer.h>
 
+#include <asm/mach/irq.h>
+
 static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)
 {
+	struct irq_chip *chip = irq_get_chip(irq);
+	chained_irq_enter(chip, desc);
 	generic_handle_irq((int)desc->irq_data.handler_data);
+	chained_irq_exit(chip, desc);
 }
 
 /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */