From 6ca34c2e3b4328c84d11531de410bd350c663e60 Mon Sep 17 00:00:00 2001
From: Mike Galbraith <efault@gmx.de>
Date: Tue, 16 Dec 2008 08:45:30 +0100
Subject: [PATCH] --- yaml --- r: 121344 b: refs/heads/master c:
 03e89e4574a680af15f59329b061f35d9813aff4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched.c      | 2 +-
 trunk/kernel/sched_fair.c | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a72cfb36cdb0..61459c7b107c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c
+refs/heads/master: 03e89e4574a680af15f59329b061f35d9813aff4
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index ad7b93be5691..88215066efae 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2266,6 +2266,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
 
 	smp_wmb();
 	rq = task_rq_lock(p, &flags);
+	update_rq_clock(rq);
 	old_state = p->state;
 	if (!(old_state & state))
 		goto out;
@@ -2323,7 +2324,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
 		schedstat_inc(p, se.nr_wakeups_local);
 	else
 		schedstat_inc(p, se.nr_wakeups_remote);
-	update_rq_clock(rq);
 	activate_task(rq, p, 1);
 	success = 1;
 
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index 98345e45b059..928cd74cff0d 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -1345,12 +1345,11 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync)
 {
 	struct task_struct *curr = rq->curr;
 	struct sched_entity *se = &curr->se, *pse = &p->se;
+	struct cfs_rq *cfs_rq = task_cfs_rq(curr);
 
-	if (unlikely(rt_prio(p->prio))) {
-		struct cfs_rq *cfs_rq = task_cfs_rq(curr);
+	update_curr(cfs_rq);
 
-		update_rq_clock(rq);
-		update_curr(cfs_rq);
+	if (unlikely(rt_prio(p->prio))) {
 		resched_task(curr);
 		return;
 	}