From f7bab32e2d6d09927cdbc318f938fbb10a0b8aa7 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Sat, 7 Jul 2012 16:49:02 +0900
Subject: [PATCH] --- yaml --- r: 321324 b: refs/heads/master c:
 45afb1734fa6323a8ba08bd6c392ee227df67dde h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d98a624a53a5..bed68270a5b8 100644
--- 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
index 5d011ef4c0df..2cb4e7777998 100644
--- 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;
 	}