summaryrefslogtreecommitdiffstats
path: root/kernel/sched/rt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-07-25 11:29:58 +0200
committerIngo Molnar <mingo@kernel.org>2018-07-25 11:29:58 +0200
commit4765096f4f7829d933354ddffedfad32cf063467 (patch)
treee8ab2bfc2062324911de12d034f5d4f222c480b6 /kernel/sched/rt.c
parentaf0fffd9300b97d8875aa745bc78e2f6fdb3c1f0 (diff)
parentf3d133ee0a17d5694c6f21873eec9863e11fa423 (diff)
downloadlinux-4765096f4f7829d933354ddffedfad32cf063467.tar.bz2
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/rt.c')
-rw-r--r--kernel/sched/rt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 2df72abfa24a..2e2955a8cf8f 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -838,6 +838,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun)
* can be time-consuming. Try to avoid it when possible.
*/
raw_spin_lock(&rt_rq->rt_runtime_lock);
+ if (!sched_feat(RT_RUNTIME_SHARE) && rt_rq->rt_runtime != RUNTIME_INF)
+ rt_rq->rt_runtime = rt_b->rt_runtime;
skip = !rt_rq->rt_time && !rt_rq->rt_nr_running;
raw_spin_unlock(&rt_rq->rt_runtime_lock);
if (skip)