From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 24 Nov 2005 06:34:03 +0000 (+1100)
Subject: [PATCH] powerpc: Fix g5 build with xmon
X-Git-Tag: v2.6.16-rc1~666^2~107
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9177ae4378add0126104e2966aa6150258610d59;p=linux-2.6-omap-h63xx.git

[PATCH] powerpc: Fix g5 build with xmon

My previous patches inadvertently broke building a G5 kernel with
CONFIG_XMON enabled. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index ff78eeac10f..a36527c9813 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -459,7 +459,7 @@ void __init pmac_pic_init(void)
 			mpic_setup_cascade(irqctrler2->intrs[0].line,
 					   pmac_u3_cascade, mpic2);
 		}
-#ifdef CONFIG_XMON
+#if defined(CONFIG_XMON) && defined(CONFIG_PPC32)
 		{
 			struct device_node* pswitch;
 			int nmi_irq;
@@ -471,7 +471,7 @@ void __init pmac_pic_init(void)
 				setup_irq(nmi_irq, &xmon_action);
 			}
 		}
-#endif	/* CONFIG_XMON */
+#endif	/* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */
 		return;
 	}
 	irqctrler = NULL;