From cde794ae055388a398e49fa293f071cc3820da0b Mon Sep 17 00:00:00 2001
From: "Steven J. Hill" <sjhill@mips.com>
Date: Fri, 31 Aug 2012 16:20:08 -0500
Subject: [PATCH] --- yaml --- r: 332260 b: refs/heads/master c:
 ec167f2d9b9ba784cc17d4449973e68665800388 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/mips/kernel/irq-gic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae0b61d3aa06..f9c0993968c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98b67c37db336446fa3a543654c012680bbe2291
+refs/heads/master: ec167f2d9b9ba784cc17d4449973e68665800388
diff --git a/trunk/arch/mips/kernel/irq-gic.c b/trunk/arch/mips/kernel/irq-gic.c
index e9a46d0205a2..c2bec301e7ad 100644
--- a/trunk/arch/mips/kernel/irq-gic.c
+++ b/trunk/arch/mips/kernel/irq-gic.c
@@ -195,7 +195,7 @@ static struct irq_chip gic_irq_controller = {
 	.irq_mask		=	gic_mask_irq,
 	.irq_mask_ack		=	gic_mask_irq,
 	.irq_unmask		=	gic_unmask_irq,
-	.irq_eoi		=	gic_unmask_irq,
+	.irq_eoi		=	gic_finish_irq,
 #ifdef CONFIG_SMP
 	.irq_set_affinity	=	gic_set_affinity,
 #endif