Quellcode durchsuchen

[POWERPC] spufs: bind_context sets SPU_STATE_RUNNABLE

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>
Christoph Hellwig vor 18 Jahren
Ursprung
Commit
81998bafe2

+ 0 - 2
arch/powerpc/platforms/cell/spufs/context.c

@@ -139,7 +139,6 @@ int spu_acquire_exclusive(struct spu_context *ctx)
 		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);
@@ -173,7 +172,6 @@ int spu_acquire_runnable(struct spu_context *ctx)
 		ret = spu_activate(ctx, 0);
 		if (ret)
 			goto out;
-		ctx->state = SPU_STATE_RUNNABLE;
 	}
 
 	downgrade_write(&ctx->state_sema);

+ 2 - 0
arch/powerpc/platforms/cell/spufs/sched.c

@@ -118,6 +118,8 @@ static inline void bind_context(struct spu *spu, struct spu_context *ctx)
 	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)