[folded-merged] bitmap-replace-bitmap_fromto_u32array-fix.patch removed from -mm tree

[folded-merged] bitmap-replace-bitmap_fromto_u32array-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: perf: arm_dsu_pmu: convert to bitmap_from_arr32
has been removed from the -mm tree.  Its filename was
     bitmap-replace-bitmap_fromto_u32array-fix.patch

This patch was dropped because it was folded into bitmap-replace-bitmap_fromto_u32array.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@arndb.de>
Subject: perf: arm_dsu_pmu: convert to bitmap_from_arr32

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.

Link: http://lkml.kernel.org/r/20180201172508.5739-2-ynorov@caviumnetworks.com
Fixes: mmotm ("bitmap: replace bitmap_{from,to}_u32array")
Fixes: 7520fa99246d ("perf: ARM DynamIQ Shared Unit PMU support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/perf/arm_dsu_pmu.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff -puN drivers/perf/arm_dsu_pmu.c~bitmap-replace-bitmap_fromto_u32array-fix drivers/perf/arm_dsu_pmu.c
--- a/drivers/perf/arm_dsu_pmu.c~bitmap-replace-bitmap_fromto_u32array-fix
+++ a/drivers/perf/arm_dsu_pmu.c
@@ -658,10 +658,8 @@ static void dsu_pmu_probe_pmu(struct dsu
 		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)
_

Patches currently in -mm which might be from arnd@arndb.de are

bitmap-replace-bitmap_fromto_u32array.patch
nilfs2-use-time64_t-internally.patch
pps-parport-use-timespec64-instead-of-timespec.patch
kasan-rework-kconfig-settings.patch