---

yaml --- r: 257155 b: refs/heads/master c: e69c634 h: refs/heads/master i: 257153: 50633e5 257151: 713fc05 v: v3
git-mirror · Dec 14, 2010 · a1760ea · a1760ea
1 parent c88c8ef
commit a1760ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;