From 9876f0e1ce0faeacaf999e2d0caef72fe425e4a8 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 Nov 2006 14:16:13 +1100
Subject: [PATCH] --- yaml --- r: 42240 b: refs/heads/master c:
 b06a318372ba95873abfe323076bd7e115d64b67 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 008e4a25b727..627f4c969beb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9df68ec7bf49e37b46aa0a5d9e7938c060dba52
+refs/heads/master: b06a318372ba95873abfe323076bd7e115d64b67
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index eb9fc621e057..e1936952017c 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/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);