On 08/01/18 12:48, Arnd Bergmann wrote:
The bitmap_from_u32array() interface got replaced in a global
change, but the arm_dsu_pmu driver adds another instance,
resulting in a build failure:

drivers/perf/arm_dsu_pmu.c: In function 'dsu_pmu_probe_pmu':
drivers/perf/arm_dsu_pmu.c:661:2: error: implicit declaration of function 
'bitmap_from_u32array'; did you mean 'bitmap_from_arr32'? 
[-Werror=implicit-function-declaration]

This changes the new instance accordingly.

Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array")
Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support")
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
The global change is currently in linux-mm, so it should be
possible to just fold this patch into it, without causing
extra work.
---
  drivers/perf/arm_dsu_pmu.c | 6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c
index 37c0526c93d5..e2700888a7d9 100644
--- a/drivers/perf/arm_dsu_pmu.c
+++ b/drivers/perf/arm_dsu_pmu.c
@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu_pmu *dsu_pmu)
                return;
        cpmceid[0] = __dsu_pmu_read_pmceid(0);
        cpmceid[1] = __dsu_pmu_read_pmceid(1);
-       bitmap_from_u32array(dsu_pmu->cpmceid_bitmap,
-                               DSU_PMU_MAX_COMMON_EVENTS,
-                               cpmceid,
-                               ARRAY_SIZE(cpmceid));
+       bitmap_from_arr32(dsu_pmu->cpmceid_bitmap, cpmceid,
+                         DSU_PMU_MAX_COMMON_EVENTS);
  }
static void dsu_pmu_set_active_cpu(int cpu, struct dsu_pmu *dsu_pmu)


Arnd,

Thanks for fixing this. FWIW,

Acked-by: Suzuki K Poulose <suzuki.poul...@arm.com>

Reply via email to