From 561d35f5a7829774910aa6d04e7ae2d8cc061e14 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Wed, 22 Apr 2009 15:31:44 +0000
Subject: [PATCH] --- yaml --- r: 149634 b: refs/heads/master c:
 f11f76d4b8ebe74100712a0f42f8c5a969aa149b h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/powermac/pic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b690791e7a5..cad491852d62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 835363e67dc27ad0809de05b2b5a8b725c95d77f
+refs/heads/master: f11f76d4b8ebe74100712a0f42f8c5a969aa149b
diff --git a/trunk/arch/powerpc/platforms/powermac/pic.c b/trunk/arch/powerpc/platforms/powermac/pic.c
index 7039d8f1d3ba..dce736349107 100644
--- a/trunk/arch/powerpc/platforms/powermac/pic.c
+++ b/trunk/arch/powerpc/platforms/powermac/pic.c
@@ -221,7 +221,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id)
 			continue;
 		irq += __ilog2(bits);
 		spin_unlock_irqrestore(&pmac_pic_lock, flags);
-		__do_IRQ(irq);
+		generic_handle_irq(irq);
 		spin_lock_irqsave(&pmac_pic_lock, flags);
 		rc = IRQ_HANDLED;
 	}