diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:33:43 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-18 13:33:43 +1000 |
| commit | 858c52d15f186e055dc33a1872f5b45a66d42296 (patch) | |
| tree | 512dd225db871ef6e2c8f7f2e1192b46edc158d4 /arch/powerpc/platforms/cell/spufs/run.c | |
| parent | 771168494719b90621ac61f9ae68c4af494e418f (diff) | |
| parent | ada397e93d6002021f5bf4ba060aa4ecd5dea3e5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs
Diffstat (limited to 'arch/powerpc/platforms/cell/spufs/run.c')
| -rw-r--r-- | arch/powerpc/platforms/cell/spufs/run.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c index 5986d08115af..96bf7c2b86fc 100644 --- a/arch/powerpc/platforms/cell/spufs/run.c +++ b/arch/powerpc/platforms/cell/spufs/run.c @@ -323,6 +323,10 @@ static int spu_process_callback(struct spu_context *ctx) return -EINTR; } + /* need to re-get the ls, as it may have changed when we released the + * spu */ + ls = (void __iomem *)ctx->ops->get_ls(ctx); + /* write result, jump over indirect pointer */ memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret)); ctx->ops->npc_write(ctx, npc); |