]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mips: use %*pb[l] to print bitmaps including cpumasks and nodemasks
authorTejun Heo <tj@kernel.org>
Fri, 13 Feb 2015 22:37:03 +0000 (14:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Feb 2015 05:21:36 +0000 (21:21 -0800)
printk and friends can now format bitmaps using '%*pb[l]'.  cpumask
and nodemask also provide cpumask_pr_args() and nodemask_pr_args()
respectively which can be used to generate the two printf arguments
necessary to format the specified cpu/nodemask.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/mips/netlogic/common/smp.c

index 4fde7ac76cc941711fb02b812e10c408b2bdf68a..e743bdd6e20cf52c2b201ba3ae41f02c80498684 100644 (file)
@@ -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;
 }