|
@@ -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.
|
|
* narrow margin doesn't have to wait for a full slice.
|
|
* This also mitigates buddy induced latencies under load.
|
|
* This also mitigates buddy induced latencies under load.
|
|
*/
|
|
*/
|
|
- if (!sched_feat(WAKEUP_PREEMPT))
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
if (delta_exec < sysctl_sched_min_granularity)
|
|
if (delta_exec < sysctl_sched_min_granularity)
|
|
return;
|
|
return;
|
|
|
|
|
|
@@ -1233,7 +1230,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
|
|
return;
|
|
return;
|
|
#endif
|
|
#endif
|
|
|
|
|
|
- if (cfs_rq->nr_running > 1 || !sched_feat(WAKEUP_PREEMPT))
|
|
|
|
|
|
+ if (cfs_rq->nr_running > 1)
|
|
check_preempt_tick(cfs_rq, curr);
|
|
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))
|
|
if (unlikely(p->policy != SCHED_NORMAL))
|
|
return;
|
|
return;
|
|
|
|
|
|
-
|
|
|
|
- if (!sched_feat(WAKEUP_PREEMPT))
|
|
|
|
- return;
|
|
|
|
-
|
|
|
|
find_matching_se(&se, &pse);
|
|
find_matching_se(&se, &pse);
|
|
update_curr(cfs_rq_of(se));
|
|
update_curr(cfs_rq_of(se));
|
|
BUG_ON(!pse);
|
|
BUG_ON(!pse);
|