From 44ef2a2c31a25a7e38681d4797eba42d1e1aff32 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 28 Mar 2011 13:59:54 +0200
Subject: [PATCH] --- yaml --- r: 243329 b: refs/heads/master c:
 1d5f821c3f9f2344e1a854aa91a5ab3b25ee5c2a h: refs/heads/master i:   243327:
 2b791a9592e15fafe60b5c0b8fb97e27a3c39e9c v: v3

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

diff --git a/[refs] b/[refs]
index 3be8e5a02b0e..4ffb9e2755b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4ec7989b4e55d9275ebac66230b7dac6dcb1fae
+refs/heads/master: 1d5f821c3f9f2344e1a854aa91a5ab3b25ee5c2a
diff --git a/trunk/arch/mips/vr41xx/common/irq.c b/trunk/arch/mips/vr41xx/common/irq.c
index 9ff7f397c0e1..70a3b85f3757 100644
--- a/trunk/arch/mips/vr41xx/common/irq.c
+++ b/trunk/arch/mips/vr41xx/common/irq.c
@@ -87,7 +87,7 @@ static void irq_dispatch(unsigned int irq)
 			atomic_inc(&irq_err_count);
 		else
 			irq_dispatch(irq);
-		if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+		if (!irqd_irq_disabled(idata) && chip->irq_unmask)
 			chip->irq_unmask(idata);
 	} else
 		do_IRQ(irq);