---

yaml --- r: 69144 b: refs/heads/master c: 9c63d9c h: refs/heads/master v: v3
git-mirror · Oct 15, 2007 · 38dd585 · 38dd585
1 parent 50ef5c2
commit 38dd585
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e20f1873d46e138c26ce83f8fe54b7221f572f
+refs/heads/master: 9c63d9c021f375a2708ad79043d6f4dd1291a085
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -1596,16 +1596,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, int sync)
 		schedstat_inc(p, se.nr_wakeups_remote);
 	update_rq_clock(rq);
 	activate_task(rq, p, 1);
-	/*
-	 * Sync wakeups (i.e. those types of wakeups where the waker
-	 * has indicated that it will leave the CPU in short order)
-	 * don't trigger a preemption, if the woken up task will run on
-	 * this cpu. (in this case the 'I will reschedule' promise of
-	 * the waker guarantees that the freshly woken up task is going
-	 * to be considered on this CPU.)
-	 */
-	if (!sync || rq->curr == rq->idle)
-		check_preempt_curr(rq, p);
+	check_preempt_curr(rq, p);
 	success = 1;
 
 out_running: