diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-11-20 22:16:13 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 04:39:12 -0500 |
commit | b06a318372ba95873abfe323076bd7e115d64b67 (patch) | |
tree | 29067e6c385f99aa6610a6e91304d51ba8c58ae2 /arch/powerpc/kernel | |
parent | f9df68ec7bf49e37b46aa0a5d9e7938c060dba52 (diff) |
[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>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index eb9fc621e057..e1936952017c 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -268,7 +268,8 @@ void do_IRQ(struct pt_regs *regs) | |||
268 | set_irq_regs(old_regs); | 268 | set_irq_regs(old_regs); |
269 | 269 | ||
270 | #ifdef CONFIG_PPC_ISERIES | 270 | #ifdef CONFIG_PPC_ISERIES |
271 | if (get_lppaca()->int_dword.fields.decr_int) { | 271 | if (firmware_has_feature(FW_FEATURE_ISERIES) && |
272 | get_lppaca()->int_dword.fields.decr_int) { | ||
272 | get_lppaca()->int_dword.fields.decr_int = 0; | 273 | get_lppaca()->int_dword.fields.decr_int = 0; |
273 | /* Signal a fake decrementer interrupt */ | 274 | /* Signal a fake decrementer interrupt */ |
274 | timer_interrupt(regs); | 275 | timer_interrupt(regs); |