projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9df68e
)
[POWERPC] iSeries: fix irq.c for combined build
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Tue, 21 Nov 2006 03:16:13 +0000
(14:16 +1100)
committer
Paul Mackerras
<paulus@samba.org>
Mon, 4 Dec 2006 09:39:12 +0000
(20:39 +1100)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/irq.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/irq.c
b/arch/powerpc/kernel/irq.c
index eb9fc621e0576f52e9161ee5c2447753da373639..e1936952017cade074aad259d9cd4ad62a4bf202 100644
(file)
--- 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);