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

Commit 71e56028 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:
 "A memory (under-)allocation fix and a comment fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/topology: Fix off by one bug
  sched/rt: Update comment in pick_next_task_rt()
parents 601a8807 993f0b05

kernel/sched/rt.c

+1 −1
Original line number Diff line number Diff line
@@ -1561,7 +1561,7 @@ pick_next_task_rt(struct rq *rq, struct task_struct *prev, struct rq_flags *rf) 


	/*

	 * We may dequeue prev's rt_rq in put_prev_task().

	 * So, we update time before rt_nr_running check.

	 * So, we update time before rt_queued check.

	 */

	if (prev->sched_class == &rt_sched_class)

		update_curr_rt(rq);

kernel/sched/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1337,7 +1337,7 @@ void sched_init_numa(void) 
	int level = 0;

	int i, j, k;



	sched_domains_numa_distance = kzalloc(sizeof(int) * nr_node_ids, GFP_KERNEL);

	sched_domains_numa_distance = kzalloc(sizeof(int) * (nr_node_ids + 1), GFP_KERNEL);

	if (!sched_domains_numa_distance)

		return;