[PATCH v2] arm64/cache: fix -Woverride-init compiler warnings

[Qian Cai]

The commit 155433cb365e ("arm64: cache: Remove support for ASID-tagged
VIVT I-caches") introduced some compiation warnings from GCC (and
Clang),

arch/arm64/kernel/cpuinfo.c:38:26: warning: initialized field
overwritten [-Woverride-init]
 [ICACHE_POLICY_VIPT]  = "VIPT",
                         ^~~~~~
arch/arm64/kernel/cpuinfo.c:38:26: note: (near initialization for
'icache_policy_str[2]')
arch/arm64/kernel/cpuinfo.c:39:26: warning: initialized field
overwritten [-Woverride-init]
 [ICACHE_POLICY_PIPT]  = "PIPT",
                         ^~~~~~
arch/arm64/kernel/cpuinfo.c:39:26: note: (near initialization for
'icache_policy_str[3]')
arch/arm64/kernel/cpuinfo.c:40:27: warning: initialized field
overwritten [-Woverride-init]
 [ICACHE_POLICY_VPIPT]  = "VPIPT",
                          ^~~~~~~
arch/arm64/kernel/cpuinfo.c:40:27: note: (near initialization for
'icache_policy_str[0]')

because it initializes icache_policy_str[0 ... 3] twice. Since the array
is only used in cpuinfo_detect_icache_policy(), fix it by initializing
a specific field there just before using.

Fixes: 155433cb365e ("arm64: cache: Remove support for ASID-tagged VIVT I-caches")
Signed-off-by: Qian Cai <cai@xxxxxx>
---

v2: Initialize a specific field in cpuinfo_detect_icache_policy().

 arch/arm64/kernel/cpuinfo.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 876055e37352..a0c495a3f4fd 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -34,10 +34,7 @@ DEFINE_PER_CPU(struct cpuinfo_arm64, cpu_data);
 static struct cpuinfo_arm64 boot_cpu_data;
 
 static char *icache_policy_str[] = {
-	[0 ... ICACHE_POLICY_PIPT]	= "RESERVED/UNKNOWN",
-	[ICACHE_POLICY_VIPT]		= "VIPT",
-	[ICACHE_POLICY_PIPT]		= "PIPT",
-	[ICACHE_POLICY_VPIPT]		= "VPIPT",
+	[0 ... ICACHE_POLICY_PIPT]	= "RESERVED/UNKNOWN"
 };
 
 unsigned long __icache_flags;
@@ -310,13 +307,16 @@ static void cpuinfo_detect_icache_policy(struct cpuinfo_arm64 *info)
 
 	switch (l1ip) {
 	case ICACHE_POLICY_PIPT:
+		icache_policy_str[ICACHE_POLICY_PIPT] = "PIPT";
 		break;
 	case ICACHE_POLICY_VPIPT:
+		icache_policy_str[ICACHE_POLICY_VPIPT] = "VPIPT";
 		set_bit(ICACHEF_VPIPT, &__icache_flags);
 		break;
 	default:
 		/* Fallthrough */
 	case ICACHE_POLICY_VIPT:
+		icache_policy_str[ICACHE_POLICY_VIPT] = "VIPT";
 		/* Assume aliasing */
 		set_bit(ICACHEF_ALIASING, &__icache_flags);
 	}
-- 
2.20.1 (Apple Git-117)