MIPS: Netlogic: Use cpumask_scnprintf for wakeup_mask

[mirror_ubuntu-artful-kernel.git] / arch / mips / netlogic / common / smp.c

diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index d81b443188af7fc502eb22b411621667c2c8f23d..4fde7ac76cc941711fb02b812e10c408b2bdf68a 100644 (file)
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -194,7 +194,7 @@ void __init nlm_smp_setup(void)
        cpumask_scnprintf(buf, ARRAY_SIZE(buf), cpu_possible_mask);
        pr_info("Possible CPU mask: %s\n", buf);
 
-       /* check with the cores we have worken up */
+       /* check with the cores we have woken up */
        for (ncore = 0, i = 0; i < NLM_NR_NODES; i++)
                ncore += hweight32(nlm_get_node(i)->coremask);
 
@@ -209,6 +209,7 @@ 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++)
@@ -243,8 +244,8 @@ static int nlm_parse_cpumask(cpumask_t *wakeup_mask)
        return threadmode;
 
 unsupp:
-       panic("Unsupported CPU mask %lx",
-               (unsigned long)cpumask_bits(wakeup_mask)[0]);
+       cpumask_scnprintf(buf, ARRAY_SIZE(buf), wakeup_mask);
+       panic("Unsupported CPU mask %s", buf);
        return 0;
 }