diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-14 09:02:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-14 09:02:14 +0200 |
| commit | dfd5c3ea641b1697333e5f6704e4e5dddfafe86b (patch) | |
| tree | 5eab12757acaec0f7ff07a48f4b66140b78eb969 /kernel/sched/core.c | |
| parent | 247f2f6f3c706b40b5f3886646f3eb53671258bf (diff) | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
| download | op-kernel-dev-dfd5c3ea641b1697333e5f6704e4e5dddfafe86b.zip op-kernel-dev-dfd5c3ea641b1697333e5f6704e4e5dddfafe86b.tar.gz | |
Merge tag 'v4.17-rc5' into sched/core, to pick up fixes and dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 71bdb86..4e0ebae 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8,6 +8,7 @@ #include "sched.h" #include <linux/kthread.h> +#include <linux/nospec.h> #include <asm/switch_to.h> #include <asm/tlb.h> @@ -6926,11 +6927,15 @@ static int cpu_weight_nice_write_s64(struct cgroup_subsys_state *css, struct cftype *cft, s64 nice) { unsigned long weight; + int idx; if (nice < MIN_NICE || nice > MAX_NICE) return -ERANGE; - weight = sched_prio_to_weight[NICE_TO_PRIO(nice) - MAX_RT_PRIO]; + idx = NICE_TO_PRIO(nice) - MAX_RT_PRIO; + idx = array_index_nospec(idx, 40); + weight = sched_prio_to_weight[idx]; + return sched_group_set_shares(css_tg(css), scale_load(weight)); } #endif |
