aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2007-07-20 15:39:32 -0400
committerArnd Bergmann <arnd@klappe.arndb.de>2007-07-20 15:41:49 -0400
commite840cfe6814d6f13ecb86cff7097ad7259df502e (patch)
tree4657c978028958950a249ceb3cbddb8bc15d207a
parentd054b36ffd302ec65aabec16a0c60ddd9e6b5a62 (diff)
[CELL] spufs: Remove spurious WARN_ON for spu_deactivate for NOSCHED contexts
In 6cbf93960e64f313f6e247cbca7afaa50e3ee2c we added a WARN_ON for calling spu_deactivate on contexts created with the SPU_CREATE_NOSCHED flag. However, all NOSCHED contexts will need to be deactivated when the context is destroyed, so this gives a spurious warning when any NOSCHED context is closed. This change removes the WARN_ON. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
-rw-r--r--arch/powerpc/platforms/cell/spufs/sched.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 9b1706cc1261..fe789308dd1e 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -550,15 +550,6 @@ static int __spu_deactivate(struct spu_context *ctx, int force, int max_prio)
550 */ 550 */
551void spu_deactivate(struct spu_context *ctx) 551void spu_deactivate(struct spu_context *ctx)
552{ 552{
553 /*
554 * We must never reach this for a nosched context,
555 * but handle the case gracefull instead of panicing.
556 */
557 if (ctx->flags & SPU_CREATE_NOSCHED) {
558 WARN_ON(1);
559 return;
560 }
561
562 __spu_deactivate(ctx, 1, MAX_PRIO); 553 __spu_deactivate(ctx, 1, MAX_PRIO);
563 spuctx_switch_state(ctx, SPUCTX_UTIL_USER); 554 spuctx_switch_state(ctx, SPUCTX_UTIL_USER);
564} 555}