From 898f4267b988a492a41e0ed31833e02b6c42e035 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Tue, 9 Nov 2010 14:36:52 +0100
Subject: [PATCH] --- yaml --- r: 222171 b: refs/heads/master c:
 2d46709082c062cae7cce1a15f8cd4cd81b92d88 h: refs/heads/master i:   222169:
 54f7b9d7b7bca762de0d83264c06da3cb55d7886   222167:
 da05d62372cc8ef38b83ee81cd9422bd1e85c353 v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/sched_stoptask.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9bf3dfb8152a..a94c1637275c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aae6d3ddd8b90f5b2c8d79a2b914d1706d124193
+refs/heads/master: 2d46709082c062cae7cce1a15f8cd4cd81b92d88
diff --git a/trunk/kernel/sched_stoptask.c b/trunk/kernel/sched_stoptask.c
index 45bddc0c1048..755483b2a2ad 100644
--- a/trunk/kernel/sched_stoptask.c
+++ b/trunk/kernel/sched_stoptask.c
@@ -26,7 +26,7 @@ static struct task_struct *pick_next_task_stop(struct rq *rq)
 {
 	struct task_struct *stop = rq->stop;
 
-	if (stop && stop->state == TASK_RUNNING)
+	if (stop && stop->se.on_rq)
 		return stop;
 
 	return NULL;