diff --git a/[refs] b/[refs] index 3f649b63bd97..ccfc988515df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2e74eeac03ffb779d64b66a643c5e598145a28b +refs/heads/master: c6ee36c423c3ed1fb86bb3eabba9fc256a300d16 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 16559de4edea..cc6dc8caa380 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2369,9 +2369,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, unsigned long flags; struct rq *rq; - if (!sched_feat(SYNC_WAKEUPS)) - wake_flags &= ~WF_SYNC; - this_cpu = get_cpu(); smp_wmb(); diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h index 1cb7c4701bf3..f54b6f9cc3dd 100644 --- a/trunk/kernel/sched_features.h +++ b/trunk/kernel/sched_features.h @@ -22,14 +22,6 @@ SCHED_FEAT(WAKEUP_PREEMPT, 1) */ SCHED_FEAT(ASYM_GRAN, 1) -/* - * 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 - * therefore has cache benefit from being placed on the same cpu, see - * also AFFINE_WAKEUPS. - */ -SCHED_FEAT(SYNC_WAKEUPS, 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 --