diff options
-rw-r--r-- | kernel/sched_fair.c | 4 | ||||
-rw-r--r-- | kernel/sched_features.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 97682f925ed5..1d99535b0928 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -1658,7 +1658,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ | |||
1658 | struct task_struct *curr = rq->curr; | 1658 | struct task_struct *curr = rq->curr; |
1659 | struct sched_entity *se = &curr->se, *pse = &p->se; | 1659 | struct sched_entity *se = &curr->se, *pse = &p->se; |
1660 | struct cfs_rq *cfs_rq = task_cfs_rq(curr); | 1660 | struct cfs_rq *cfs_rq = task_cfs_rq(curr); |
1661 | int sync = wake_flags & WF_SYNC; | ||
1662 | int scale = cfs_rq->nr_running >= sched_nr_latency; | 1661 | int scale = cfs_rq->nr_running >= sched_nr_latency; |
1663 | 1662 | ||
1664 | if (unlikely(rt_prio(p->prio))) | 1663 | if (unlikely(rt_prio(p->prio))) |
@@ -1691,9 +1690,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ | |||
1691 | if (unlikely(curr->policy == SCHED_IDLE)) | 1690 | if (unlikely(curr->policy == SCHED_IDLE)) |
1692 | goto preempt; | 1691 | goto preempt; |
1693 | 1692 | ||
1694 | if (sched_feat(WAKEUP_SYNC) && sync) | ||
1695 | goto preempt; | ||
1696 | |||
1697 | if (!sched_feat(WAKEUP_PREEMPT)) | 1693 | if (!sched_feat(WAKEUP_PREEMPT)) |
1698 | return; | 1694 | return; |
1699 | 1695 | ||
diff --git a/kernel/sched_features.h b/kernel/sched_features.h index 850f9809cf81..1cb7c4701bf3 100644 --- a/kernel/sched_features.h +++ b/kernel/sched_features.h | |||
@@ -23,11 +23,6 @@ SCHED_FEAT(WAKEUP_PREEMPT, 1) | |||
23 | SCHED_FEAT(ASYM_GRAN, 1) | 23 | SCHED_FEAT(ASYM_GRAN, 1) |
24 | 24 | ||
25 | /* | 25 | /* |
26 | * Always wakeup-preempt SYNC wakeups, see SYNC_WAKEUPS. | ||
27 | */ | ||
28 | SCHED_FEAT(WAKEUP_SYNC, 0) | ||
29 | |||
30 | /* | ||
31 | * Use the SYNC wakeup hint, pipes and the likes use this to indicate | 26 | * Use the SYNC wakeup hint, pipes and the likes use this to indicate |
32 | * the remote end is likely to consume the data we just wrote, and | 27 | * the remote end is likely to consume the data we just wrote, and |
33 | * therefore has cache benefit from being placed on the same cpu, see | 28 | * therefore has cache benefit from being placed on the same cpu, see |