summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2007-01-12 09:52:41 +0900
committerPaul Mackerras <paulus@samba.org>2007-01-24 21:13:59 +1100
commit3650cfe2e51432030e469afd75a429c199c4e42f (patch)
tree7d7d94ff4afa30ef71b45eb7808f3c61e8993f9b /arch
parentc53653130f2868e44c6e8346d110d27d39e7d07b (diff)
downloadlinux-stable-3650cfe2e51432030e469afd75a429c199c4e42f.tar.gz
linux-stable-3650cfe2e51432030e469afd75a429c199c4e42f.tar.bz2
linux-stable-3650cfe2e51432030e469afd75a429c199c4e42f.zip
[POWERPC] spufs: Add SPU register lock
spu->register_lock should be held before accessing registers. Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/cell/spu_base.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index bd7bffc3ddd0..c43999a10deb 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -170,9 +170,11 @@ int
spu_irq_class_0_bottom(struct spu *spu)
{
unsigned long stat, mask;
+ unsigned long flags;
spu->class_0_pending = 0;
+ spin_lock_irqsave(&spu->register_lock, flags);
mask = spu_int_mask_get(spu, 0);
stat = spu_int_stat_get(spu, 0);
@@ -188,6 +190,7 @@ spu_irq_class_0_bottom(struct spu *spu)
__spu_trap_error(spu);
spu_int_stat_clear(spu, 0, stat);
+ spin_unlock_irqrestore(&spu->register_lock, flags);
return (stat & 0x7) ? -EIO : 0;
}