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

Stephen Rothwell sfr at canb.auug.org.au
Mon Nov 13 14:44:40 EST 2006


Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
---
 arch/powerpc/kernel/irq.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index eb9fc62..e173c76 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -267,13 +267,12 @@ void do_IRQ(struct pt_regs *regs)
         irq_exit();
 	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);
 	}
-#endif
 }
 
 void __init init_IRQ(void)
-- 
1.4.3.3




More information about the Linuxppc-dev mailing list