|
|
@@ -3218,12 +3218,18 @@ __setparam_dl(struct task_struct *p, const struct sched_attr *attr)
|
|
|
dl_se->dl_yielded = 0;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * sched_setparam() passes in -1 for its policy, to let the functions
|
|
|
+ * it calls know not to change it.
|
|
|
+ */
|
|
|
+#define SETPARAM_POLICY -1
|
|
|
+
|
|
|
static void __setscheduler_params(struct task_struct *p,
|
|
|
const struct sched_attr *attr)
|
|
|
{
|
|
|
int policy = attr->sched_policy;
|
|
|
|
|
|
- if (policy == -1) /* setparam */
|
|
|
+ if (policy == SETPARAM_POLICY)
|
|
|
policy = p->policy;
|
|
|
|
|
|
p->policy = policy;
|
|
|
@@ -3572,11 +3578,8 @@ static int _sched_setscheduler(struct task_struct *p, int policy,
|
|
|
.sched_nice = PRIO_TO_NICE(p->static_prio),
|
|
|
};
|
|
|
|
|
|
- /*
|
|
|
- * Fixup the legacy SCHED_RESET_ON_FORK hack, except if
|
|
|
- * the policy=-1 was passed by sched_setparam().
|
|
|
- */
|
|
|
- if ((policy != -1) && (policy & SCHED_RESET_ON_FORK)) {
|
|
|
+ /* Fixup the legacy SCHED_RESET_ON_FORK hack. */
|
|
|
+ if ((policy != SETPARAM_POLICY) && (policy & SCHED_RESET_ON_FORK)) {
|
|
|
attr.sched_flags |= SCHED_FLAG_RESET_ON_FORK;
|
|
|
policy &= ~SCHED_RESET_ON_FORK;
|
|
|
attr.sched_policy = policy;
|
|
|
@@ -3746,7 +3749,7 @@ SYSCALL_DEFINE3(sched_setscheduler, pid_t, pid, int, policy,
|
|
|
*/
|
|
|
SYSCALL_DEFINE2(sched_setparam, pid_t, pid, struct sched_param __user *, param)
|
|
|
{
|
|
|
- return do_sched_setscheduler(pid, -1, param);
|
|
|
+ return do_sched_setscheduler(pid, SETPARAM_POLICY, param);
|
|
|
}
|
|
|
|
|
|
/**
|