Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4df9d88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

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
parents 902f2ac9 ec5d4989

kernel/sched.c

+6 −0
Original line number Diff line number Diff line
@@ -8909,6 +8909,9 @@ static int sched_rt_global_constraints(void) 
	u64 rt_runtime, rt_period;

	int ret = 0;



	if (sysctl_sched_rt_period <= 0)

		return -EINVAL;



	rt_period = ktime_to_ns(tg->rt_bandwidth.rt_period);

	rt_runtime = tg->rt_bandwidth.rt_runtime;
@@ -8925,6 +8928,9 @@ static int sched_rt_global_constraints(void) 
	unsigned long flags;

	int i;



	if (sysctl_sched_rt_period <= 0)

		return -EINVAL;



	spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags);

	for_each_possible_cpu(i) {

		struct rt_rq *rt_rq = &cpu_rq(i)->rt;

kernel/sched_rt.c

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ static void __enable_runtime(struct rq *rq) 
		spin_lock(&rt_rq->rt_runtime_lock);

		rt_rq->rt_runtime = rt_b->rt_runtime;

		rt_rq->rt_time = 0;

		rt_rq->rt_throttled = 0;

		spin_unlock(&rt_rq->rt_runtime_lock);

		spin_unlock(&rt_b->rt_runtime_lock);

	}