From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 Nov 2006 03:16:13 +0000 (+1100)
Subject: [POWERPC] iSeries: fix irq.c for combined build
X-Git-Tag: v2.6.20-rc2~6^2~13^2~13^2~112
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b06a318372ba95873abfe323076bd7e115d64b67;p=linux-2.6-omap-h63xx.git

[POWERPC] iSeries: fix irq.c for combined build

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index eb9fc621e05..e1936952017 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -268,7 +268,8 @@ void do_IRQ(struct pt_regs *regs)
 	set_irq_regs(old_regs);
 
 #ifdef CONFIG_PPC_ISERIES
-	if (get_lppaca()->int_dword.fields.decr_int) {
+	if (firmware_has_feature(FW_FEATURE_ISERIES) &&
+			get_lppaca()->int_dword.fields.decr_int) {
 		get_lppaca()->int_dword.fields.decr_int = 0;
 		/* Signal a fake decrementer interrupt */
 		timer_interrupt(regs);