Commit 19dba4f3 authored Mar 28, 2015 by Linus Torvalds

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

parents ee9b63dd 746db944

kernel/sched/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}