From da4021514d89b14912f8e169cc406b4011246d72 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Tue, 24 May 2011 20:34:18 +0000
Subject: [PATCH] --- yaml --- r: 251827 b: refs/heads/master c:
 2e455257d143f54b44701e947a092d513889d01c h: refs/heads/master i:   251825:
 78685d2c16da3c1fa8e77da389aba5020a7c4961   251823:
 5d72b7e19b19d5f411fadc284acbb7e8b9c9830c v: v3

---
 [refs]                          | 2 +-
 trunk/arch/powerpc/kernel/irq.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 465b5c87c790..e08dc5957e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d1b5e206a4f0ce46f2aa138590738c5d8e118ac
+refs/heads/master: 2e455257d143f54b44701e947a092d513889d01c
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 0df255414836..ac4d29119f3e 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -295,17 +295,20 @@ static inline void handle_one_irq(unsigned int irq)
 	unsigned long saved_sp_limit;
 	struct irq_desc *desc;
 
+	desc = irq_to_desc(irq);
+	if (!desc)
+		return;
+
 	/* Switch to the irq stack to handle this */
 	curtp = current_thread_info();
 	irqtp = hardirq_ctx[smp_processor_id()];
 
 	if (curtp == irqtp) {
 		/* We're already on the irq stack, just handle it */
-		generic_handle_irq(irq);
+		desc->handle_irq(irq, desc);
 		return;
 	}
 
-	desc = irq_to_desc(irq);
 	saved_sp_limit = current->thread.ksp_limit;
 
 	irqtp->task = curtp->task;