diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-11-21 14:16:13 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 20:39:12 +1100 |
| commit | b06a318372ba95873abfe323076bd7e115d64b67 (patch) | |
| tree | 29067e6c385f99aa6610a6e91304d51ba8c58ae2 /arch/powerpc | |
| parent | f9df68ec7bf49e37b46aa0a5d9e7938c060dba52 (diff) | |
| download | blackbird-op-linux-b06a318372ba95873abfe323076bd7e115d64b67.tar.gz blackbird-op-linux-b06a318372ba95873abfe323076bd7e115d64b67.zip | |
[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')
| -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) 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); |
