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

Commit ab14398a authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: setup_per_cpu_areas() cleanup 



Impact: cleanup

__alloc_bootmem and __alloc_bootmem_node do panic
for us in case of fail so no need for additional
checks here.

Also lets use pr_*() macros for printing.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8fd2d2d5

arch/x86/kernel/setup_percpu.c

+8 −17
Original line number Diff line number Diff line
@@ -153,12 +153,10 @@ void __init setup_per_cpu_areas(void) 
	align = max_t(unsigned long, PAGE_SIZE, align);

	size = roundup(old_size, align);



	printk(KERN_INFO

		"NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",

	pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",

		NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);



	printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",

			  size);

	pr_info("PERCPU: Allocating %zd bytes of per cpu data\n", size);



	for_each_possible_cpu(cpu) {

#ifndef CONFIG_NEED_MULTIPLE_NODES
@@ -169,21 +167,14 @@ void __init setup_per_cpu_areas(void) 
		if (!node_online(node) || !NODE_DATA(node)) {

			ptr = __alloc_bootmem(size, align,

					 __pa(MAX_DMA_ADDRESS));

			printk(KERN_INFO

			       "cpu %d has no node %d or node-local memory\n",

			pr_info("cpu %d has no node %d or node-local memory\n",

				cpu, node);

			if (ptr)

				printk(KERN_DEBUG

					"per cpu data for cpu%d at %016lx\n",

			pr_debug("per cpu data for cpu%d at %016lx\n",

				 cpu, __pa(ptr));

		}

		else {

		} else {

			ptr = __alloc_bootmem_node(NODE_DATA(node), size, align,

							__pa(MAX_DMA_ADDRESS));

			if (ptr)

				printk(KERN_DEBUG

					"per cpu data for cpu%d on node%d "

					"at %016lx\n",

			pr_debug("per cpu data for cpu%d on node%d at %016lx\n",

				cpu, node, __pa(ptr));

		}

#endif