From 04da720058e5a9f4ad93dea0cb8c3a0d9c8fccb6 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 27 Nov 2009 15:44:43 +0100
Subject: [PATCH] --- yaml --- r: 175582 b: refs/heads/master c:
 ab19cb23313733c55e0517607844b86720b35f5f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e3ce5c6c2053..f20e6da9d4c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5afcdab706d6002cb02b567ba46e650215e694e8
+refs/heads/master: ab19cb23313733c55e0517607844b86720b35f5f
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 1f9c6d99f15d..c92670f8e097 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2371,17 +2371,14 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
 	if (task_contributes_to_load(p))
 		rq->nr_uninterruptible--;
 	p->state = TASK_WAKING;
-	task_rq_unlock(rq, &flags);
+	__task_rq_unlock(rq);
 
 	cpu = select_task_rq(p, SD_BALANCE_WAKE, wake_flags);
-	if (cpu != orig_cpu) {
-		local_irq_save(flags);
-		rq = cpu_rq(cpu);
-		update_rq_clock(rq);
+	if (cpu != orig_cpu)
 		set_task_cpu(p, cpu);
-		local_irq_restore(flags);
-	}
-	rq = task_rq_lock(p, &flags);
+
+	rq = __task_rq_lock(p);
+	update_rq_clock(rq);
 
 	WARN_ON(p->state != TASK_WAKING);
 	cpu = task_cpu(p);