From d3a2089cb06685cf9f596a7c385ac197a71c0f4d Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Tue, 13 Oct 2009 19:44:56 +0000
Subject: [PATCH] --- yaml --- r: 175721 b: refs/heads/master c:
 76f1d94f3ebdee0d14cab4d87bdeed1cf9badb17 h: refs/heads/master i:   175719:
 32f158670b33ed60b5c2d97887cf5821a70034b4 v: v3

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

diff --git a/[refs] b/[refs]
index ca1aa9e677d9..7e61f7a3828a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c105c3781d32c55429fbac493602028913390a
+refs/heads/master: 76f1d94f3ebdee0d14cab4d87bdeed1cf9badb17
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 65632215f020..baa49eb93228 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -1065,8 +1065,11 @@ static int virq_debug_show(struct seq_file *m, void *private)
 	seq_printf(m, "%-5s  %-7s  %-15s  %s\n", "virq", "hwirq",
 		      "chip name", "host name");
 
-	for (i = 1; i < NR_IRQS; i++) {
+	for (i = 1; i < nr_irqs; i++) {
 		desc = irq_to_desc(i);
+		if (!desc)
+			continue;
+
 		spin_lock_irqsave(&desc->lock, flags);
 
 		if (desc->action && desc->action->handler) {