1 files changed, 12 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index b7493b865812..f7edba6cb795 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -27,7 +27,6 @@ void spufs_stop_callback(struct spu *spu, int irq)
                 switch(irq) {
                 case 0 :
                         ctx->csa.class_0_pending = spu->class_0_pending;
-                        ctx->csa.class_0_dsisr = spu->class_0_dsisr;
                         ctx->csa.class_0_dar = spu->class_0_dar;
                         break;
                 case 1 :
@@ -51,18 +50,22 @@ int spu_stopped(struct spu_context *ctx, u32 *stat)
         u64 dsisr;
         u32 stopped;
 
-        *stat = ctx->ops->status_read(ctx);
-
-        if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags))
-                return 1;
-
         stopped = SPU_STATUS_INVALID_INSTR | SPU_STATUS_SINGLE_STEP |
                 SPU_STATUS_STOPPED_BY_HALT | SPU_STATUS_STOPPED_BY_STOP;
-        if (!(*stat & SPU_STATUS_RUNNING) && (*stat & stopped))
+
+top:
+        *stat = ctx->ops->status_read(ctx);
+        if (*stat & stopped) {
+                /*
+                 * If the spu hasn't finished stopping, we need to
+                 * re-read the register to get the stopped value.
+                 */
+                if (*stat & SPU_STATUS_RUNNING)
+                        goto top;
                 return 1;
+        }
 
-        dsisr = ctx->csa.class_0_dsisr;
-        if (dsisr & (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED))
+        if (test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags))
                 return 1;
 
         dsisr = ctx->csa.class_1_dsisr;