Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit 19dba4f3e9f7 · 2015-03-28T11:17:32.000-07:00
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
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3034,6 +3034,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio)`
`3034`	`3034`	`} else {`
`3035`	`3035`	`if (dl_prio(oldprio))`
`3036`	`3036`	`p->dl.dl_boosted = 0;`
	`3037`	`+ if (rt_prio(oldprio))`
	`3038`	`+ p->rt.timeout = 0;`
`3037`	`3039`	`p->sched_class = &fair_sched_class;`
`3038`	`3040`	`}`
`3039`	`3041`