hulk inclusion category: other bugzilla: NA -------------------------------- This reverts commit 0ee4371c8c32558332ad709909c0e1b051b25a7f. Temp revert, or the "sched/syscalls: Split out kernel/sched/syscalls.c from kernel/sched/core.c" will have conflicts. Label: qzc_conflicts Signed-off-by: Zicheng Qu <quzicheng@huawei.com> --- kernel/sched/core.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 95e79ec6f33b..ecc8f7d2a9bc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7638,35 +7638,6 @@ static bool check_same_owner(struct task_struct *p) uid_eq(cred->euid, pcred->uid)); } -#ifdef CONFIG_RT_MUTEXES -static inline void __setscheduler_dl_pi(int newprio, int policy, - struct task_struct *p, - int *queue_flags) -{ - /* - * In case a DEADLINE task (either proper or boosted) gets - * setscheduled to a lower priority class, check if it neeeds to - * inherit parameters from a potential pi_task. In that case make - * sure replenishment happens with the next enqueue. - */ - - if (dl_prio(newprio) && !dl_policy(policy)) { - struct task_struct *pi_task = rt_mutex_get_top_task(p); - - if (pi_task) { - p->dl.pi_se = pi_task->dl.pi_se; - *queue_flags |= ENQUEUE_REPLENISH; - } - } -} -#else /* !CONFIG_RT_MUTEXES */ -static inline void __setscheduler_dl_pi(int newprio, int policy, - struct task_struct *p, - int *queue_flags) -{ -} -#endif /* !CONFIG_RT_MUTEXES */ - /* * Allow unprivileged RT tasks to decrease priority. * Only issue a capable test if needed and only once to avoid an audit @@ -7931,7 +7902,6 @@ static int __sched_setscheduler(struct task_struct *p, if (!(attr->sched_flags & SCHED_FLAG_KEEP_PARAMS)) { __setscheduler_params(p, attr); __setscheduler_prio(p, newprio); - __setscheduler_dl_pi(newprio, policy, p, &queue_flags); } __setscheduler_uclamp(p, attr); -- 2.34.1