Merge branch 'linux-4.6' of git://github.com/skeggsb/linux into drm-fixes

[deliverable/linux.git] / mm / percpu-km.c

diff --git a/mm/percpu-km.c b/mm/percpu-km.c
index 10e3d0b8a86d1bbbd9749bccb9666d4251155450..d66911ff42d9618dd73107548e4f99b06d2f98ef 100644 (file)
--- a/mm/percpu-km.c
+++ b/mm/percpu-km.c
@@ -95,7 +95,7 @@ static int __init pcpu_verify_alloc_info(const struct pcpu_alloc_info *ai)
 
        /* all units must be in a single group */
        if (ai->nr_groups != 1) {
-               printk(KERN_CRIT "percpu: can't handle more than one groups\n");
+               pr_crit("can't handle more than one group\n");
                return -EINVAL;
        }
 
@@ -103,8 +103,8 @@ static int __init pcpu_verify_alloc_info(const struct pcpu_alloc_info *ai)
        alloc_pages = roundup_pow_of_two(nr_pages);
 
        if (alloc_pages > nr_pages)
-               printk(KERN_WARNING "percpu: wasting %zu pages per chunk\n",
-                      alloc_pages - nr_pages);
+               pr_warn("wasting %zu pages per chunk\n",
+                       alloc_pages - nr_pages);
 
        return 0;
 }