From a1760ea5c2688aeaebfd5882c897bf21a621fce1 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 6 Dec 2010 17:10:31 -0500
Subject: [PATCH] --- yaml --- r: 257155 b: refs/heads/master c:
 e69c634190dc724ef2d845ace8d783031d3e492e h: refs/heads/master i:   257153:
 50633e5f8e56a95d62e072c2f8b5e0fbf887f521   257151:
 713fc05bc54908e20664b8f16458949d9bb5ec83 v: v3

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

diff --git a/[refs] b/[refs]
index 57baca14ecfa..734c10e61ea6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63f01241176d7cbc976385aec32f0a209b0bc36a
+refs/heads/master: e69c634190dc724ef2d845ace8d783031d3e492e
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 269a0450281c..6d24b2e8d82d 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2458,7 +2458,7 @@ static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq,
 	if (p->sched_class->task_woken)
 		p->sched_class->task_woken(rq, p);
 
-	if (unlikely(rq->idle_stamp)) {
+	if (rq->idle_stamp) {
 		u64 delta = rq->clock - rq->idle_stamp;
 		u64 max = 2*sysctl_sched_migration_cost;