tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: fix deadlock in setting scheduler parameter to zero
sched: fix 2.6.27-rc5 couldn't boot on tulsa machine randomly

Linus Torvalds b4df9d88 902f2ac9

+7
unified split
+6
kernel/sched.c
··· 8909 8909 u64 rt_runtime, rt_period; 8910 8910 int ret = 0; 8911 8911 8912 + if (sysctl_sched_rt_period <= 0) 8913 + return -EINVAL; 8914 + 8912 8915 rt_period = ktime_to_ns(tg->rt_bandwidth.rt_period); 8913 8916 rt_runtime = tg->rt_bandwidth.rt_runtime; 8914 8917 ··· 8927 8924 { 8928 8925 unsigned long flags; 8929 8926 int i; 8927 + 8928 + if (sysctl_sched_rt_period <= 0) 8929 + return -EINVAL; 8930 8930 8931 8931 spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags); 8932 8932 for_each_possible_cpu(i) {
+1
kernel/sched_rt.c
··· 350 350 spin_lock(&rt_rq->rt_runtime_lock); 351 351 rt_rq->rt_runtime = rt_b->rt_runtime; 352 352 rt_rq->rt_time = 0; 353 + rt_rq->rt_throttled = 0; 353 354 spin_unlock(&rt_rq->rt_runtime_lock); 354 355 spin_unlock(&rt_b->rt_runtime_lock); 355 356 }