Merge tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[pandora-kernel.git] / arch / ia64 / kernel / topology.c

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index f295f9a..965ab42 100644 (file)
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -217,14 +217,12 @@ static ssize_t show_number_of_sets(struct cache_info *this_leaf, char *buf)
 
 static ssize_t show_shared_cpu_map(struct cache_info *this_leaf, char *buf)
 {
-       ssize_t len;
        cpumask_t shared_cpu_map;
 
        cpumask_and(&shared_cpu_map,
                                &this_leaf->shared_cpu_map, cpu_online_mask);
-       len = cpumask_scnprintf(buf, NR_CPUS+1, &shared_cpu_map);
-       len += sprintf(buf+len, "\n");
-       return len;
+       return scnprintf(buf, PAGE_SIZE, "%*pb\n",
+                        cpumask_pr_args(&shared_cpu_map));
 }
 
 static ssize_t show_type(struct cache_info *this_leaf, char *buf)