From 81998bafe299b8b675157f0a4dfe8dad43215da9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 13 Feb 2007 21:36:48 +0100 Subject: [PATCH] [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 Signed-off-by: Arnd Bergmann --- arch/powerpc/platforms/cell/spufs/context.c | 2 -- arch/powerpc/platforms/cell/spufs/sched.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c index dd89aa7c1f16..ccffc449763b 100644 --- a/arch/powerpc/platforms/cell/spufs/context.c +++ b/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); diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 6599cba9689b..7e9657eb690c 100644 --- a/arch/powerpc/platforms/cell/spufs/sched.c +++ b/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) -- 2.30.2