Commit 40685236 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files

x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)



- Added #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 - Stripped PERCPU: from a pr_warning
Signed-off-by: default avatarJoe Perches <joe@perches.com>
LKML-Reference: <7ead24eccbea8f2b11795abad3e2893a98e1e111.1260383912.git.joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5cd476ef
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -20,9 +22,9 @@ ...@@ -20,9 +22,9 @@
#include <asm/stackprotector.h> #include <asm/stackprotector.h>
#ifdef CONFIG_DEBUG_PER_CPU_MAPS #ifdef CONFIG_DEBUG_PER_CPU_MAPS
# define DBG(x...) printk(KERN_DEBUG x) # define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)
#else #else
# define DBG(x...) # define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)
#endif #endif
DEFINE_PER_CPU(int, cpu_number); DEFINE_PER_CPU(int, cpu_number);
...@@ -116,8 +118,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, ...@@ -116,8 +118,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
} else { } else {
ptr = __alloc_bootmem_node_nopanic(NODE_DATA(node), ptr = __alloc_bootmem_node_nopanic(NODE_DATA(node),
size, align, goal); size, align, goal);
pr_debug("per cpu data for cpu%d %lu bytes on node%d at " pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n",
"%016lx\n", cpu, size, node, __pa(ptr)); cpu, size, node, __pa(ptr));
} }
return ptr; return ptr;
#else #else
...@@ -198,8 +200,7 @@ void __init setup_per_cpu_areas(void) ...@@ -198,8 +200,7 @@ void __init setup_per_cpu_areas(void)
pcpu_cpu_distance, pcpu_cpu_distance,
pcpu_fc_alloc, pcpu_fc_free); pcpu_fc_alloc, pcpu_fc_free);
if (rc < 0) if (rc < 0)
pr_warning("PERCPU: %s allocator failed (%d), " pr_warning("%s allocator failed (%d), falling back to page size\n",
"falling back to page size\n",
pcpu_fc_names[pcpu_chosen_fc], rc); pcpu_fc_names[pcpu_chosen_fc], rc);
} }
if (rc < 0) if (rc < 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment