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>

1 files changed, 7 insertions, 10 deletions

diff --git a/mm/sparse.c b/mm/sparse.c
index 7cdb27d9f01f..5d0cf4540364 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -313,9 +313,8 @@ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
 
         usemap_nid = sparse_early_nid(__nr_to_section(usemap_snr));
         if (usemap_nid != nid) {
-                printk(KERN_INFO
-                       "node %d must be removed before remove section %ld\n",
-                       nid, usemap_snr);
+                pr_info("node %d must be removed before remove section %ld\n",
+                        nid, usemap_snr);
                 return;
         }
         /*
@@ -324,10 +323,8 @@ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
          * gather other removable sections for dynamic partitioning.
          * Just notify un-removable section's number here.
          */
-        printk(KERN_INFO "Section %ld and %ld (node %d)", usemap_snr,
-               pgdat_snr, nid);
-        printk(KERN_CONT
-               " have a circular dependency on usemap and pgdat allocations\n");
+        pr_info("Section %ld and %ld (node %d) have a circular dependency on usemap and pgdat allocations\n",
+                usemap_snr, pgdat_snr, nid);
 }
 #else
 static unsigned long * __init
@@ -355,7 +352,7 @@ static void __init sparse_early_usemaps_alloc_node(void *data,
         usemap = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nodeid),
                                                           size * usemap_count);
         if (!usemap) {
-                printk(KERN_WARNING "%s: allocation failed\n", __func__);
+                pr_warn("%s: allocation failed\n", __func__);
                 return;
         }
 
@@ -428,7 +425,7 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,
                 if (map_map[pnum])
                         continue;
                 ms = __nr_to_section(pnum);
-                printk(KERN_ERR "%s: sparsemem memory map backing failed some memory will not be available.\n",
+                pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
                        __func__);
                 ms->section_mem_map = 0;
         }
@@ -456,7 +453,7 @@ static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum)
         if (map)
                 return map;
 
-        printk(KERN_ERR "%s: sparsemem memory map backing failed some memory will not be available.\n",
+        pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
                __func__);
         ms->section_mem_map = 0;
         return NULL;