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: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 49f3f70..a4b619c 100644 (file)
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -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,22 +167,15 @@ 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",
-                                        cpu, __pa(ptr));
-               }
-               else {
+                       pr_debug("per cpu data for cpu%d at %016lx\n",
+                                cpu, __pa(ptr));
+               } 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",
-                                       cpu, node, __pa(ptr));
+                       pr_debug("per cpu data for cpu%d on node%d at %016lx\n",
+                               cpu, node, __pa(ptr));
                }
 #endif
                per_cpu_offset(cpu) = ptr - __per_cpu_start;