From 63f54586c33e1d09fdc1220ae5647d65e41fe361 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 13 Feb 2007 21:36:47 +0100
Subject: [PATCH] --- yaml --- r: 48243 b: refs/heads/master c:
 aa56c16807ba7b8e801216cab012d2f498755ba5 h: refs/heads/master i:   48241:
 1cac5a6a4d7bbd3434ef90c22f377644f3640c45   48239:
 dd6698eba637f5f2389bab6c03bb7f74baa0b0fa v: v3

---
 [refs]                                            | 2 +-
 trunk/arch/powerpc/platforms/cell/spufs/context.c | 4 +---
 trunk/arch/powerpc/platforms/cell/spufs/sched.c   | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d2a16cb866ca..f5a154e52926 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cb23afc9e64841adb43d46160a5c63a80ebfd54
+refs/heads/master: aa56c16807ba7b8e801216cab012d2f498755ba5
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/context.c b/trunk/arch/powerpc/platforms/cell/spufs/context.c
index 28c718ca3b51..dd89aa7c1f16 100644
--- a/trunk/arch/powerpc/platforms/cell/spufs/context.c
+++ b/trunk/arch/powerpc/platforms/cell/spufs/context.c
@@ -197,10 +197,8 @@ void spu_acquire_saved(struct spu_context *ctx)
 	up_read(&ctx->state_sema);
 	down_write(&ctx->state_sema);
 
-	if (ctx->state == SPU_STATE_RUNNABLE) {
+	if (ctx->state == SPU_STATE_RUNNABLE)
 		spu_deactivate(ctx);
-		ctx->state = SPU_STATE_SAVED;
-	}
 
 	downgrade_write(&ctx->state_sema);
 }
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/sched.c b/trunk/arch/powerpc/platforms/cell/spufs/sched.c
index bd6fe4b7a84b..6599cba9689b 100644
--- a/trunk/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/trunk/arch/powerpc/platforms/cell/spufs/sched.c
@@ -315,7 +315,6 @@ void spu_yield(struct spu_context *ctx)
 				pr_debug("%s: yielding SPU %d NODE %d\n",
 					 __FUNCTION__, spu->number, spu->node);
 				spu_deactivate(ctx);
-				ctx->state = SPU_STATE_SAVED;
 				need_yield = 1;
 			} else {
 				spu->prio = MAX_PRIO;