summaryrefslogtreecommitdiffstats
path: root/mm/bootmem.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2016-03-17 17:19:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 18:09:34 -0400
commit1170532bb49f9468aedabdc1d5a560e2521a2bcc (patch)
tree0197245ba37726d4ba7325e0de8129d45f8f49d9 /mm/bootmem.c
parent756a025f00091918d9d09ca3229defb160b409c0 (diff)
mm: convert printk(KERN_<LEVEL> to pr_<level>
Most of the mm subsystem uses pr_<level> so make it consistent. Miscellanea: - Realign arguments - Add missing newline to format - kmemleak-test.c has a "kmemleak: " prefix added to the "Kmemleak testing" logging message via pr_fmt Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Tejun Heo <tj@kernel.org> [percpu] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r--mm/bootmem.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index 91e32bc8517f..0aa7dda52402 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -50,8 +50,7 @@ early_param("bootmem_debug", bootmem_debug_setup);
50 50
51#define bdebug(fmt, args...) ({ \ 51#define bdebug(fmt, args...) ({ \
52 if (unlikely(bootmem_debug)) \ 52 if (unlikely(bootmem_debug)) \
53 printk(KERN_INFO \ 53 pr_info("bootmem::%s " fmt, \
54 "bootmem::%s " fmt, \
55 __func__, ## args); \ 54 __func__, ## args); \
56}) 55})
57 56
@@ -680,7 +679,7 @@ static void * __init ___alloc_bootmem(unsigned long size, unsigned long align,
680 /* 679 /*
681 * Whoops, we cannot satisfy the allocation request. 680 * Whoops, we cannot satisfy the allocation request.
682 */ 681 */
683 printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size); 682 pr_alert("bootmem alloc of %lu bytes failed!\n", size);
684 panic("Out of memory"); 683 panic("Out of memory");
685 return NULL; 684 return NULL;
686} 685}
@@ -755,7 +754,7 @@ void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
755 if (ptr) 754 if (ptr)
756 return ptr; 755 return ptr;
757 756
758 printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size); 757 pr_alert("bootmem alloc of %lu bytes failed!\n", size);
759 panic("Out of memory"); 758 panic("Out of memory");
760 return NULL; 759 return NULL;
761} 760}