Merge branch 'mlx4-net'

[firefly-linux-kernel-4.4.55.git] / drivers / bus / arm-cci.c

diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 0ce5e2d65a06b5d4e6ecbdf3390554f08751d9e2..84fd66057dadf9e60b6c9ad04e535334265cda01 100644 (file)
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -806,8 +806,8 @@ static int cci_pmu_event_init(struct perf_event *event)
 static ssize_t pmu_attr_cpumask_show(struct device *dev,
                                     struct device_attribute *attr, char *buf)
 {
-       int n = cpulist_scnprintf(buf, PAGE_SIZE - 2, &pmu->cpus);
-
+       int n = scnprintf(buf, PAGE_SIZE - 1, "%*pbl",
+                         cpumask_pr_args(&pmu->cpus));
        buf[n++] = '\n';
        buf[n] = '\0';
        return n;