---

yaml --- r: 91570 b: refs/heads/master c: 4eb5aef h: refs/heads/master v: v3
git-mirror · Mar 28, 2008 · 27954f1 · 27954f1
1 parent 413ddff
commit 27954f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af8b44e01b4e5a94cb665f6b958f5a5bc4025b0e
+refs/heads/master: 4eb5aef583aab29dc125b6c2feb0b31f2e350c45
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/run.c b/trunk/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);