From: Jeremy Kerr Date: Fri, 20 Jul 2007 19:39:32 +0000 (+0200) Subject: [CELL] spufs: Remove spurious WARN_ON for spu_deactivate for NOSCHED contexts X-Git-Tag: v2.6.23-rc1~195^2~22 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e840cfe6814d6f13ecb86cff7097ad7259df502e;p=linux-2.6 [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 Signed-off-by: Arnd Bergmann --- diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c index 9b1706cc12..fe789308dd 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) */ void spu_deactivate(struct spu_context *ctx) { - /* - * We must never reach this for a nosched context, - * but handle the case gracefull instead of panicing. - */ - if (ctx->flags & SPU_CREATE_NOSCHED) { - WARN_ON(1); - return; - } - __spu_deactivate(ctx, 1, MAX_PRIO); spuctx_switch_state(ctx, SPUCTX_UTIL_USER); }