summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.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/page_alloc.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/page_alloc.c')
-rw-r--r--mm/page_alloc.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 42cf199652a5..2a9eaec770b0 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -544,11 +544,11 @@ static int __init debug_guardpage_minorder_setup(char *buf)
544 unsigned long res; 544 unsigned long res;
545 545
546 if (kstrtoul(buf, 10, &res) < 0 || res > MAX_ORDER / 2) { 546 if (kstrtoul(buf, 10, &res) < 0 || res > MAX_ORDER / 2) {
547 printk(KERN_ERR "Bad debug_guardpage_minorder value\n"); 547 pr_err("Bad debug_guardpage_minorder value\n");
548 return 0; 548 return 0;
549 } 549 }
550 _debug_guardpage_minorder = res; 550 _debug_guardpage_minorder = res;
551 printk(KERN_INFO "Setting debug_guardpage_minorder to %lu\n", res); 551 pr_info("Setting debug_guardpage_minorder to %lu\n", res);
552 return 0; 552 return 0;
553} 553}
554__setup("debug_guardpage_minorder=", debug_guardpage_minorder_setup); 554__setup("debug_guardpage_minorder=", debug_guardpage_minorder_setup);
@@ -4073,8 +4073,7 @@ static int __parse_numa_zonelist_order(char *s)
4073 } else if (*s == 'z' || *s == 'Z') { 4073 } else if (*s == 'z' || *s == 'Z') {
4074 user_zonelist_order = ZONELIST_ORDER_ZONE; 4074 user_zonelist_order = ZONELIST_ORDER_ZONE;
4075 } else { 4075 } else {
4076 printk(KERN_WARNING 4076 pr_warn("Ignoring invalid numa_zonelist_order value: %s\n", s);
4077 "Ignoring invalid numa_zonelist_order value: %s\n", s);
4078 return -EINVAL; 4077 return -EINVAL;
4079 } 4078 }
4080 return 0; 4079 return 0;
@@ -5458,8 +5457,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
5458 " %s zone: %lu pages used for memmap\n", 5457 " %s zone: %lu pages used for memmap\n",
5459 zone_names[j], memmap_pages); 5458 zone_names[j], memmap_pages);
5460 } else 5459 } else
5461 printk(KERN_WARNING 5460 pr_warn(" %s zone: %lu pages exceeds freesize %lu\n",
5462 " %s zone: %lu pages exceeds freesize %lu\n",
5463 zone_names[j], memmap_pages, freesize); 5461 zone_names[j], memmap_pages, freesize);
5464 } 5462 }
5465 5463
@@ -5667,8 +5665,7 @@ static unsigned long __init find_min_pfn_for_node(int nid)
5667 min_pfn = min(min_pfn, start_pfn); 5665 min_pfn = min(min_pfn, start_pfn);
5668 5666
5669 if (min_pfn == ULONG_MAX) { 5667 if (min_pfn == ULONG_MAX) {
5670 printk(KERN_WARNING 5668 pr_warn("Could not find start_pfn for node %d\n", nid);
5671 "Could not find start_pfn for node %d\n", nid);
5672 return 0; 5669 return 0;
5673 } 5670 }
5674 5671
@@ -6686,11 +6683,8 @@ void *__init alloc_large_system_hash(const char *tablename,
6686 if (!table) 6683 if (!table)
6687 panic("Failed to allocate %s hash table\n", tablename); 6684 panic("Failed to allocate %s hash table\n", tablename);
6688 6685
6689 printk(KERN_INFO "%s hash table entries: %ld (order: %d, %lu bytes)\n", 6686 pr_info("%s hash table entries: %ld (order: %d, %lu bytes)\n",
6690 tablename, 6687 tablename, 1UL << log2qty, ilog2(size) - PAGE_SHIFT, size);
6691 (1UL << log2qty),
6692 ilog2(size) - PAGE_SHIFT,
6693 size);
6694 6688
6695 if (_hash_shift) 6689 if (_hash_shift)
6696 *_hash_shift = log2qty; 6690 *_hash_shift = log2qty;
@@ -7191,8 +7185,8 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)
7191 BUG_ON(!PageBuddy(page)); 7185 BUG_ON(!PageBuddy(page));
7192 order = page_order(page); 7186 order = page_order(page);
7193#ifdef CONFIG_DEBUG_VM 7187#ifdef CONFIG_DEBUG_VM
7194 printk(KERN_INFO "remove from free list %lx %d %lx\n", 7188 pr_info("remove from free list %lx %d %lx\n",
7195 pfn, 1 << order, end_pfn); 7189 pfn, 1 << order, end_pfn);
7196#endif 7190#endif
7197 list_del(&page->lru); 7191 list_del(&page->lru);
7198 rmv_page_order(page); 7192 rmv_page_order(page);