summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-01-20 16:06:05 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-20 16:06:05 -0800
commitc2cf1ccf5414a1970aeba561ea575f502201bc82 (patch)
tree5006fd202ee645948a2eff47faec615037094d9b
parent245a89acb1941681c3d1ea4f0d6c6d1d8739780d (diff)
[PATCH] switch FRV to use local_soft_irq_pending
The newly merged frv do_IRQ code calls softirq_pending(), but always with the current cpu as argument - switch to local_softirq_pending(). Btw, this usage look bogus to me, any reason you need to call do_softirq again after you did four lines above in irq_exit(), David? Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/frv/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 71f84cd12fd1..8221d02693b8 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -312,7 +312,7 @@ asmlinkage void do_IRQ(void)
/* only process softirqs if we didn't interrupt another interrupt handler */
if ((__frame->psr & PSR_PIL) == PSR_PIL_0)
- if (softirq_pending(cpu))
+ if (local_softirq_pending())
do_softirq();
#ifdef CONFIG_PREEMPT