---

yaml --- r: 87031 b: refs/heads/master c: 6fa46fa h: refs/heads/master i: 87029: 4d5d80e 87027: 446251f 87023: c47fe67 v: v3
git-mirror · Mar 7, 2008 · 822696e · 822696e
1 parent 322a9ab
commit 822696e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 810b38179e9e4d4f57b4b733767bb08f8291a965
+refs/heads/master: 6fa46fa526f2cab9ce21fa5e39501553a40d196d
diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c
@@ -1107,9 +1107,11 @@ static void prio_changed_rt(struct rq *rq, struct task_struct *p,
 			pull_rt_task(rq);
 		/*
 		 * If there's a higher priority task waiting to run
-		 * then reschedule.
+		 * then reschedule. Note, the above pull_rt_task
+		 * can release the rq lock and p could migrate.
+		 * Only reschedule if p is still on the same runqueue.
 		 */
-		if (p->prio > rq->rt.highest_prio)
+		if (p->prio > rq->rt.highest_prio && rq->curr == p)
 			resched_task(p);
 #else
 		/* For UP simply resched on drop of prio */