Merge branch 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-block.git] / mm / sparse-vmemmap.c

diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
index b60802b3e5ead91c346ffd1b47d90b77155bdf79..68885dcbaf40f251f1d48d6b4291256a330825df 100644 (file)
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -166,8 +166,8 @@ void __meminit vmemmap_verify(pte_t *pte, int node,
        int actual_node = early_pfn_to_nid(pfn);
 
        if (node_distance(actual_node, node) > LOCAL_DISTANCE)
-               printk(KERN_WARNING "[%lx-%lx] potential offnode "
-                       "page_structs\n", start, end - 1);
+               pr_warn("[%lx-%lx] potential offnode page_structs\n",
+                       start, end - 1);
 }
 
 pte_t * __meminit vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node)
@@ -292,8 +292,8 @@ 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", __func__);
+               pr_err("%s: sparsemem memory map backing failed some memory will not be available\n",
+                      __func__);
                ms->section_mem_map = 0;
        }