From 0c79de67b4e7eb3bb887929bc8963604cf5586c4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 4 Mar 2019 10:50:50 +0900 Subject: [PATCH] warnings: disable override-init for arm perfctr arrays The arrays first init every fields to invalid op then override a few fields, since this is not something we want to allow everywhere use a GCC pragma to only ignore the warning there. Change-Id: I498546fe60d60d4b000d711e22e04c8c360b5b83 --- arch/arm64/kernel/perfctr_armv8pmu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/kernel/perfctr_armv8pmu.c b/arch/arm64/kernel/perfctr_armv8pmu.c index 03321b3d..ad660179 100644 --- a/arch/arm64/kernel/perfctr_armv8pmu.c +++ b/arch/arm64/kernel/perfctr_armv8pmu.c @@ -174,6 +174,10 @@ /* PMUv3 HW events mapping. */ +/* disable -Woverride-init for the following initializations */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Woverride-init" + /* * @ref.impl linux-v4.15-rc3 arch/arm64/kernel/perf_event.c * ARMv8 Architectural defined events, not all of these may @@ -219,6 +223,9 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX] [C(BPU)][C(OP_WRITE)][C(RESULT_MISS)] = ARMV8_PMUV3_PERFCTR_BR_MIS_PRED, }; +/* restore warnings */ +#pragma GCC diagnostic pop + /* @ref.impl linux-v4.15-rc3 drivers/perf/arm_pmu.c */ static int armpmu_map_cache_event(const unsigned (*cache_map)