diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-03-13 12:49:16 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2026-03-17 12:16:35 +0300 |
| commit | 8510d054b7e086a71a9191ac3399231290dfd272 (patch) | |
| tree | 54dd1686133ff78f127b211753f8de0c09971d64 | |
| parent | 1211907ac0b5f35e5720620c50b7ca3c72d81f7e (diff) | |
| download | linux-8510d054b7e086a71a9191ac3399231290dfd272.tar.xz | |
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>
| -rw-r--r-- | arch/arm64/kvm/hyp_trace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm64/kvm/hyp_trace.c b/arch/arm64/kvm/hyp_trace.c index c1e28f6581ab..8b7f2bf2fba8 100644 --- 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(); |