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

Commit 48b1db7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull scheduler fixes from Ingo Molnar:
 "Two fixes: a stop-machine preemption fix and a SCHED_DEADLINE fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/deadline: Fix switched_from_dl() warning
  stop_machine: Disable preemption when waking two stopper threads
parents ea75a2c7 e117cb52

kernel/sched/deadline.c

+10 −1
Original line number Diff line number Diff line
@@ -2290,8 +2290,17 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p) 
	if (task_on_rq_queued(p) && p->dl.dl_runtime)

		task_non_contending(p);



	if (!task_on_rq_queued(p))

	if (!task_on_rq_queued(p)) {

		/*

		 * Inactive timer is armed. However, p is leaving DEADLINE and

		 * might migrate away from this rq while continuing to run on

		 * some other class. We need to remove its contribution from

		 * this rq running_bw now, or sub_rq_bw (below) will complain.

		 */

		if (p->dl.dl_non_contending)

			sub_running_bw(&p->dl, &rq->dl);

		sub_rq_bw(&p->dl, &rq->dl);

	}



	/*

	 * We cannot use inactive_task_timer() to invoke sub_running_bw()

kernel/stop_machine.c

+5 −1
Original line number Diff line number Diff line
@@ -270,7 +270,11 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1, 
		goto retry;

	}



	if (!err) {

		preempt_disable();

		wake_up_q(&wakeq);

		preempt_enable();

	}



	return err;

}