From 126df267e5b364efb52a72c30da8fef293d719c8 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Wed, 10 Oct 2012 23:19:15 +0000
Subject: [PATCH] --- yaml --- r: 335839 b: refs/heads/master c:
 e34298c9a29a4b5bdcbb9a8994cc61f6ba506a94 h: refs/heads/master i:   335837:
 f03eb41724e776a1a5e9fd10e79bd44a6d138c4a   335835:
 96326d8627634fd6f89046ae4f00c0df7879ab14   335831:
 5176f2d279cb8b822072048e45a74c2f517b51b1   335823:
 9d441603748849a7307de3acd31e5619e4733478   335807:
 fbe74a06c3a8cfc0b6e51e7fb5e2db62a9cfecc3 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1460be514c22..392f2a8249d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4221a7a63abd1b6e358d19fe4d05e4d2e44e11a
+refs/heads/master: e34298c9a29a4b5bdcbb9a8994cc61f6ba506a94
diff --git a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 8520b58a5e9a..b89ef65392dc 100644
--- a/trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/trunk/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -372,10 +372,11 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
 	case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break;
 	case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
 	case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
-	default:
-		pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n",
-		       __func__, virq, l1irq, l2irq);
-		return -EINVAL;
+	case MPC52xx_IRQ_L1_CRIT:
+		pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
+			__func__, l2irq);
+		irq_set_chip(virq, &no_irq_chip);
+		return 0;
 	}
 
 	irq_set_chip_and_handler(virq, irqchip, handle_level_irq);