From be89796d8411c774c5f47f2a32271d2f882abdef Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Thu, 11 Mar 2010 17:17:18 +0100 Subject: [PATCH] --- yaml --- r: 191391 b: refs/heads/master c: f2e74eeac03ffb779d64b66a643c5e598145a28b h: refs/heads/master i: 191389: 7db3d62c10c25e0bda75c18582ee8c3e6d234d4f 191387: f7aa55e0a84571d64a4d8ff52c8d8361ae96aedf 191383: 51febc58ca1cfecdc213a000f404423e375b3005 191375: 16524d549f713a1fe1d81f77991975e1f3861a10 191359: e5ddf3a68a255c528b2179e834ce44db0fd531cc v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 4 ---- trunk/kernel/sched_features.h | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 124fa779b7b2..3f649b63bd97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ca9880c6f4ba4c84b517bc2fed5366adf63d191 +refs/heads/master: f2e74eeac03ffb779d64b66a643c5e598145a28b diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 97682f925ed5..1d99535b0928 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1658,7 +1658,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ struct task_struct *curr = rq->curr; struct sched_entity *se = &curr->se, *pse = &p->se; struct cfs_rq *cfs_rq = task_cfs_rq(curr); - int sync = wake_flags & WF_SYNC; int scale = cfs_rq->nr_running >= sched_nr_latency; if (unlikely(rt_prio(p->prio))) @@ -1691,9 +1690,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ if (unlikely(curr->policy == SCHED_IDLE)) goto preempt; - if (sched_feat(WAKEUP_SYNC) && sync) - goto preempt; - if (!sched_feat(WAKEUP_PREEMPT)) return; diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h index 850f9809cf81..1cb7c4701bf3 100644 --- a/trunk/kernel/sched_features.h +++ b/trunk/kernel/sched_features.h @@ -22,11 +22,6 @@ SCHED_FEAT(WAKEUP_PREEMPT, 1) */ SCHED_FEAT(ASYM_GRAN, 1) -/* - * Always wakeup-preempt SYNC wakeups, see SYNC_WAKEUPS. - */ -SCHED_FEAT(WAKEUP_SYNC, 0) - /* * Use the SYNC wakeup hint, pipes and the likes use this to indicate * the remote end is likely to consume the data we just wrote, and