aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-03-28 11:17:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-03-28 11:17:32 -0700
commit19dba4f3e9f7fef811cf446e15f578887762528a (patch)
tree9475909710cffb7bd2ee62f66e48089f0f145412
parentee9b63dd0fed60565829b489d29f80927a6fcf3d (diff)
parent746db9443ea57fd9c059f62c4bfbf41cf224fe13 (diff)
downloadlinux-19dba4f3e9f7fef811cf446e15f578887762528a.tar.gz
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: "A single sched/rt corner case fix for RLIMIT_RTIME correctness" * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched: Fix RLIMIT_RTTIME when PI-boosting to RT
-rw-r--r--kernel/sched/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f0f831e8a34..62671f53202 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3034,6 +3034,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
} else {
if (dl_prio(oldprio))
p->dl.dl_boosted = 0;
+ if (rt_prio(oldprio))
+ p->rt.timeout = 0;
p->sched_class = &fair_sched_class;
}