---

yaml --- r: 321324 b: refs/heads/master c: 45afb17 h: refs/heads/master v: v3
git-mirror · Jul 26, 2012 · f7bab32 · f7bab32
1 parent 48485c5
commit f7bab32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6956dc568f34107f1d02b24f87efe7250803fc87
+refs/heads/master: 45afb1734fa6323a8ba08bd6c392ee227df67dde
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
@@ -4340,9 +4340,7 @@ static int __sched_setscheduler(struct task_struct *p, int policy,
 	 */
 	if (unlikely(policy == p->policy && (!rt_policy(policy) ||
 			param->sched_priority == p->rt_priority))) {
-
-		__task_rq_unlock(rq);
-		raw_spin_unlock_irqrestore(&p->pi_lock, flags);
+		task_rq_unlock(rq, p, &flags);
 		return 0;
 	}