KVM: arm64: avoid unused-variable warning

The 'cpu' variable is only used inside of an #ifdef block and causes
a warning if there is no user:

arch/arm64/kvm/hyp_trace.c: In function 'kvm_hyp_trace_init':
arch/arm64/kvm/hyp_trace.c:422:13: error: unused variable 'cpu' [-Werror=unused-variable]
  422 |         int cpu;
      |             ^~~

Change the #ifdef to an equivalent IS_ENABLED() check to avoid
the warning.

Fixes: b22888917fa4 ("KVM: arm64: Sync boot clock with the nVHE/pKVM hyp")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Vincent Donnefort <vdonnefort@google.com>
Link: https://patch.msgid.link/20260313094925.3749287-1-arnd@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c
index c1e28f6581ab8a9b128e9293e22f97b53aa6c2b8..8b7f2bf2fba84dce85b56f5d88e3104f5d672cbd 100644 (file)
--- a/arch/arm64/kvm/hyp_trace.c
+++ b/arch/arm64/kvm/hyp_trace.c
@@ -424,17 +424,16 @@ int __init kvm_hyp_trace_init(void)
        if (is_kernel_in_hyp_mode())
                return 0;
 
-#ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND
        for_each_possible_cpu(cpu) {
                const struct arch_timer_erratum_workaround *wa =
                        per_cpu(timer_unstable_counter_workaround, cpu);
 
-               if (wa && wa->read_cntvct_el0) {
+               if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND) &&
+                   wa && wa->read_cntvct_el0) {
                        pr_warn("hyp trace can't handle CNTVCT workaround '%s'\n", wa->desc);
                        return -EOPNOTSUPP;
                }
        }
-#endif
 
        hyp_trace_init_events();