Skip to content
  • Arnd Bergmann's avatar
    arm64: avoid -Woverride-init warning · 332576e6
    Arnd Bergmann authored
    The icache_policy_str[] definition causes a warning when extra
    warning flags are enabled:
    arch/arm64/kernel/cpuinfo.c:38:26: warning: initialized field overwritten [-Woverride-init]
       38 |  [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]
       39 |  [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]
       40 |  [ICACHE_POLICY_VPIPT]  = "VPIPT",
          |                           ^~~~~~~
    arch/arm64/kernel/cpuinfo.c:40:27: note: (near initialization for 'icache_policy_str[0]')
    There is no real need for the default initializer here, as printing a
    NULL string is harmless. Rewrite the logic to have an explicit
    reserved value for the only one that uses the default value.
    This partially reverts the commit that removed ICACHE_POLICY_AIVIVT.
    Fixes: 155433cb
     ("arm64: cache: Remove support for ASID-tagged VIVT I-caches")
    Signed-off-by: default avatarArnd Bergmann <>
    Signed-off-by: default avatarWill Deacon <>