Merge tag 'v4.0-rc1' into perf/core, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index 4fde7ac76cc9..e743bdd6e20c 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -162,7 +162,6 @@ void __init nlm_smp_setup(void)
         unsigned int boot_cpu;
         int num_cpus, i, ncore, node;
         volatile u32 *cpu_ready = nlm_get_boot_data(BOOT_CPU_READY);
-        char buf[64];
 
         boot_cpu = hard_smp_processor_id();
         cpumask_clear(&phys_cpu_present_mask);
@@ -189,10 +188,10 @@ void __init nlm_smp_setup(void)
                 }
         }
 
-        cpumask_scnprintf(buf, ARRAY_SIZE(buf), &phys_cpu_present_mask);
-        pr_info("Physical CPU mask: %s\n", buf);
-        cpumask_scnprintf(buf, ARRAY_SIZE(buf), cpu_possible_mask);
-        pr_info("Possible CPU mask: %s\n", buf);
+        pr_info("Physical CPU mask: %*pb\n",
+                cpumask_pr_args(&phys_cpu_present_mask));
+        pr_info("Possible CPU mask: %*pb\n",
+                cpumask_pr_args(cpu_possible_mask));
 
         /* check with the cores we have woken up */
         for (ncore = 0, i = 0; i < NLM_NR_NODES; i++)
@@ -209,7 +208,6 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask)
 {
         uint32_t core0_thr_mask, core_thr_mask;
         int threadmode, i, j;
-        char buf[64];
 
         core0_thr_mask = 0;
         for (i = 0; i < NLM_THREADS_PER_CORE; i++)
@@ -244,8 +242,7 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask)
         return threadmode;
 
 unsupp:
-        cpumask_scnprintf(buf, ARRAY_SIZE(buf), wakeup_mask);
-        panic("Unsupported CPU mask %s", buf);
+        panic("Unsupported CPU mask %*pb", cpumask_pr_args(wakeup_mask));
         return 0;
 }