From 59a0770320807436c8a6f4295a2d5d95c80ecf4e Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 20 Jul 2007 21:39:32 +0200
Subject: [PATCH] --- yaml --- r: 62241 b: refs/heads/master c:
 e840cfe6814d6f13ecb86cff7097ad7259df502e h: refs/heads/master i:   62239:
 826fc24214d2ebe379a0f225b5412a3027c5d369 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/cell/spufs/sched.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5b81aae0b2ef..affcbe6ea8a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d054b36ffd302ec65aabec16a0c60ddd9e6b5a62
+refs/heads/master: e840cfe6814d6f13ecb86cff7097ad7259df502e
diff --git a/trunk/arch/powerpc/platforms/cell/spufs/sched.c b/trunk/arch/powerpc/platforms/cell/spufs/sched.c
index 9b1706cc1261..fe789308dd1e 100644
--- a/trunk/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/trunk/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);
 }