From 8def7c6216c0ae2363ecedde1dbbfc6aa7affea5 Mon Sep 17 00:00:00 2001
From: Yong Zhang <yong.zhang0@gmail.com>
Date: Fri, 29 Jul 2011 16:20:33 +0800
Subject: [PATCH] --- yaml --- r: 269132 b: refs/heads/master c:
 2c2efaed9bc973e3aeab1385c618017b56c8f6d7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/sched_fair.c     | 9 +--------
 trunk/kernel/sched_features.h | 5 -----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a5b99a82cbe1..d052570fe658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2b245f89ee3f5b03fb42d843a79a58cf4773181
+refs/heads/master: 2c2efaed9bc973e3aeab1385c618017b56c8f6d7
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index bc8ee9993814..241fc86bc613 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -1095,9 +1095,6 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	 * narrow margin doesn't have to wait for a full slice.
 	 * This also mitigates buddy induced latencies under load.
 	 */
-	if (!sched_feat(WAKEUP_PREEMPT))
-		return;
-
 	if (delta_exec < sysctl_sched_min_granularity)
 		return;
 
@@ -1233,7 +1230,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
 		return;
 #endif
 
-	if (cfs_rq->nr_running > 1 || !sched_feat(WAKEUP_PREEMPT))
+	if (cfs_rq->nr_running > 1)
 		check_preempt_tick(cfs_rq, curr);
 }
 
@@ -1899,10 +1896,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
 	if (unlikely(p->policy != SCHED_NORMAL))
 		return;
 
-
-	if (!sched_feat(WAKEUP_PREEMPT))
-		return;
-
 	find_matching_se(&se, &pse);
 	update_curr(cfs_rq_of(se));
 	BUG_ON(!pse);
diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h
index 2e74677cb040..efa0a7b75dde 100644
--- a/trunk/kernel/sched_features.h
+++ b/trunk/kernel/sched_features.h
@@ -11,11 +11,6 @@ SCHED_FEAT(GENTLE_FAIR_SLEEPERS, 1)
  */
 SCHED_FEAT(START_DEBIT, 1)
 
-/*
- * Should wakeups try to preempt running tasks.
- */
-SCHED_FEAT(WAKEUP_PREEMPT, 1)
-
 /*
  * Based on load and program behaviour, see if it makes sense to place
  * a newly woken task on the same cpu as the task that woke it --