Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[people/ms/linux.git] / arch / sparc / kernel / smp_64.c

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index eb94557983383e8d2f8d1b0ee17a14cd64d9cc2f..80f20b3808eebe4f7ddc3b0a17450253df28985d 100644 (file)
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1684,9 +1684,9 @@ void __init setup_per_cpu_areas(void)
                                            pcpu_alloc_bootmem,
                                            pcpu_free_bootmem);
                if (rc)
-                       pr_warning("PERCPU: %s allocator failed (%d), "
-                                  "falling back to page size\n",
-                                  pcpu_fc_names[pcpu_chosen_fc], rc);
+                       pr_warn("PERCPU: %s allocator failed (%d), "
+                               "falling back to page size\n",
+                               pcpu_fc_names[pcpu_chosen_fc], rc);
        }
        if (rc < 0)
                rc = pcpu_page_first_chunk(PERCPU_MODULE_RESERVE,