Subject: spufs: bind_context sets SPU_STATE_RUNNABLE

From: Christoph Hellwig <hch@lst.de>
Only bind_context/unbind_context change the spu context state.  Thus
we can move all assignents of SPU_STATE_RUNNABLE into bind_context,
which parallels the unbind side aswell.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
---
Index: linux-2.6/arch/powerpc/platforms/cell/spufs/context.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/spufs/context.c
+++ linux-2.6/arch/powerpc/platforms/cell/spufs/context.c
@@ -135,7 +135,6 @@ int spu_acquire_exclusive(struct spu_con
 		ret = spu_activate(ctx, 0);
 		if (ret)
 			goto out;
-		ctx->state = SPU_STATE_RUNNABLE;
 	} else {
 		/* We need to exclude userspace access to the context. */
 		spu_unmap_mappings(ctx);
@@ -169,7 +168,6 @@ int spu_acquire_runnable(struct spu_cont
 		ret = spu_activate(ctx, 0);
 		if (ret)
 			goto out;
-		ctx->state = SPU_STATE_RUNNABLE;
 	}
 
 	downgrade_write(&ctx->state_sema);
Index: linux-2.6/arch/powerpc/platforms/cell/spufs/sched.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/spufs/sched.c
+++ linux-2.6/arch/powerpc/platforms/cell/spufs/sched.c
@@ -118,6 +118,8 @@ static inline void bind_context(struct s
 	spu->timestamp = jiffies;
 	spu_cpu_affinity_set(spu, raw_smp_processor_id());
 	spu_switch_notify(spu, ctx);
+
+	ctx->state = SPU_STATE_RUNNABLE;
 }
 
 static inline void unbind_context(struct spu *spu, struct spu_context *ctx)