drivers/base: use %*pb[l] to print bitmaps including cpumasks and nodemasks

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.

* Line termination only requires one extra space at the end of the
  buffer.  Use PAGE_SIZE - 1 instead of PAGE_SIZE - 2 when formatting.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index f829a4c71749cfbf2b174804b3c72241f78ee0ff..f160ea44a86d68a26b689b5ff7c5f0bcaf5ec74e 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -245,7 +245,7 @@ static ssize_t print_cpus_offline(struct device *dev,
        if (!alloc_cpumask_var(&offline, GFP_KERNEL))
                return -ENOMEM;
        cpumask_andnot(offline, cpu_possible_mask, cpu_online_mask);
-       n = cpulist_scnprintf(buf, len, offline);
+       n = scnprintf(buf, len, "%*pbl", cpumask_pr_args(offline));
        free_cpumask_var(offline);
 
        /* display offline cpus >= nr_cpu_ids */

diff --git a/drivers/base/node.c b/drivers/base/node.c
index a3b82e9c7f200283c1c4a6c67ef7028707dd9abc..36fabe43cd4497b83eba8afdef4358325045f88b 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -605,7 +605,8 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
 {
        int n;
 
-       n = nodelist_scnprintf(buf, PAGE_SIZE-2, node_states[state]);
+       n = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+                     nodemask_pr_args(&node_states[state]));
        buf[n++] = '\n';
        buf[n] = '\0';
        return n;