From f9e9fc64a9bfb3f3bee1c315de5d454bf640c1c7 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Thu, 18 Aug 2011 13:02:12 +0900
Subject: [PATCH] --- yaml --- r: 263561 b: refs/heads/master c:
 995b528ad25968472742c50fe964d44fac2b857a h: refs/heads/master i:   263559:
 8fc044807fc2f3c483b05bea097e26b78f23bf84 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/plat-samsung/irq-vic-timer.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77dd0389b14d..74b24ff87dd7 100644
--- 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
index f714d060370d..51583cd30164 100644
--- 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. */