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

Commit 0fb53029 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

sched: use slab in cpupri_init() 



Lets not use the bootmem allocator in cpupri_init() as slab is already up when
it is run.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 4bdddf8f

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -7795,7 +7795,7 @@ static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem) 
	if (!alloc_cpumask_var(&rd->rto_mask, gfp))

		goto free_online;



	if (cpupri_init(&rd->cpupri, false) != 0)

	if (cpupri_init(&rd->cpupri, bootmem) != 0)

		goto free_rto_mask;

	return 0;

kernel/sched_cpupri.c

+5 −3
Original line number Diff line number Diff line
@@ -154,8 +154,12 @@ void cpupri_set(struct cpupri *cp, int cpu, int newpri) 
 */

int __init_refok cpupri_init(struct cpupri *cp, bool bootmem)

{

	gfp_t gfp = GFP_KERNEL;

	int i;



	if (bootmem)

		gfp = GFP_NOWAIT;



	memset(cp, 0, sizeof(*cp));



	for (i = 0; i < CPUPRI_NR_PRIORITIES; i++) {
@@ -163,9 +167,7 @@ int __init_refok cpupri_init(struct cpupri *cp, bool bootmem) 


		spin_lock_init(&vec->lock);

		vec->count = 0;

		if (bootmem)

			alloc_bootmem_cpumask_var(&vec->mask);

		else if (!zalloc_cpumask_var(&vec->mask, GFP_KERNEL))

		if (!zalloc_cpumask_var(&vec->mask, gfp))

			goto cleanup;

	}