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

Commit 38c7fed2 authored by Yinghai Lu's avatar Yinghai Lu Committed by Pekka Enberg
Browse files

x86: remove some alloc_bootmem_cpumask_var calling 



Now that we set up the slab allocator earlier, we can get rid of some
alloc_bootmem_cpumask_var() calls in boot code.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent a5f4f52e

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -185,8 +185,8 @@ int __init arch_early_irq_init(void) 
	for (i = 0; i < count; i++) {

		desc = irq_to_desc(i);

		desc->chip_data = &cfg[i];

		alloc_bootmem_cpumask_var(&cfg[i].domain);

		alloc_bootmem_cpumask_var(&cfg[i].old_domain);

		alloc_cpumask_var(&cfg[i].domain, GFP_NOWAIT);

		alloc_cpumask_var(&cfg[i].old_domain, GFP_NOWAIT);

		if (i < NR_IRQS_LEGACY)

			cpumask_setall(cfg[i].domain);

	}

include/linux/irq.h

+7 −11
Original line number Diff line number Diff line
@@ -432,21 +432,17 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry); 
static inline bool alloc_desc_masks(struct irq_desc *desc, int node,

							bool boot)

{

#ifdef CONFIG_CPUMASK_OFFSTACK

	if (boot) {

		alloc_bootmem_cpumask_var(&desc->affinity);

	gfp_t gfp = GFP_ATOMIC;



#ifdef CONFIG_GENERIC_PENDING_IRQ

		alloc_bootmem_cpumask_var(&desc->pending_mask);

#endif

		return true;

	}

	if (boot)

		gfp = GFP_NOWAIT;



	if (!alloc_cpumask_var_node(&desc->affinity, GFP_ATOMIC, node))

#ifdef CONFIG_CPUMASK_OFFSTACK

	if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))

		return false;



#ifdef CONFIG_GENERIC_PENDING_IRQ

	if (!alloc_cpumask_var_node(&desc->pending_mask, GFP_ATOMIC, node)) {

	if (!alloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {

		free_cpumask_var(desc->affinity);

		return false;

	}

kernel/cpuset.c

+1 −1
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ struct cgroup_subsys cpuset_subsys = { 


int __init cpuset_init_early(void)

{

	alloc_bootmem_cpumask_var(&top_cpuset.cpus_allowed);

	alloc_cpumask_var(&top_cpuset.cpus_allowed, GFP_NOWAIT);



	top_cpuset.mems_generation = cpuset_mems_generation++;

	return 0;

kernel/profile.c

+0 −6
Original line number Diff line number Diff line
@@ -111,12 +111,6 @@ int __ref profile_init(void) 
	/* only text is profiled */

	prof_len = (_etext - _stext) >> prof_shift;

	buffer_bytes = prof_len*sizeof(atomic_t);

	if (!slab_is_available()) {

		prof_buffer = alloc_bootmem(buffer_bytes);

		alloc_bootmem_cpumask_var(&prof_cpu_mask);

		cpumask_copy(prof_cpu_mask, cpu_possible_mask);

		return 0;

	}



	if (!alloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL))

		return -ENOMEM;

lib/cpumask.c

+2 −9
Original line number Diff line number Diff line
@@ -92,15 +92,8 @@ int cpumask_any_but(const struct cpumask *mask, unsigned int cpu) 
 */

bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)

{

	if (likely(slab_is_available()))

	*mask = kmalloc_node(cpumask_size(), flags, node);

	else {

#ifdef CONFIG_DEBUG_PER_CPU_MAPS

		printk(KERN_ERR

			"=> alloc_cpumask_var: kmalloc not available!\n");

#endif

		*mask = NULL;

	}



#ifdef CONFIG_DEBUG_PER_CPU_MAPS

	if (!*mask) {

		printk(KERN_ERR "=> alloc_cpumask_var: failed!\n");