]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: arm64: Fix __deactivate_fgt macro parameter typo
authorFuad Tabba <tabba@google.com>
Fri, 1 May 2026 11:21:46 +0000 (12:21 +0100)
committerMarc Zyngier <maz@kernel.org>
Thu, 7 May 2026 13:12:41 +0000 (14:12 +0100)
__deactivate_fgt() declares its first parameter as "htcxt" but the body
references "hctxt". The parameter is unused; the macro silently captures
"hctxt" from the enclosing scope. Both existing callers
(__deactivate_traps_hfgxtr() and __deactivate_traps_ich_hfgxtr()) happen
to define a local "struct kvm_cpu_context *hctxt", so the macro works
by coincidence.

A future caller without an "hctxt" local in scope, or naming it
differently, would compile but bind to the wrong context. Align the
parameter name with the sibling __activate_fgt() macro.

The "vcpu" parameter remains unused in the body, kept for API symmetry
with __activate_fgt() (which uses it).

Fixes: f5a5a406b4b8 ("KVM: arm64: Propagate and handle Fine-Grained UNDEF bits")
Assisted-by: Gemini:gemini-3.1-pro review-prompts
Signed-off-by: Fuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260501112149.2824881-4-tabba@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/hyp/include/hyp/switch.h

index 98b2976837b116149823f6daf141f490b8182bd8..bf0eb5e434274af0842178c84208907a3c9795d7 100644 (file)
@@ -245,7 +245,7 @@ static inline void __activate_traps_ich_hfgxtr(struct kvm_vcpu *vcpu)
        __activate_fgt(hctxt, vcpu, ICH_HFGITR_EL2);
 }
 
-#define __deactivate_fgt(htcxt, vcpu, reg)                             \
+#define __deactivate_fgt(hctxt, vcpu, reg)                             \
        do {                                                            \
                write_sysreg_s(ctxt_sys_reg(hctxt, reg),                \
                               SYS_ ## reg);                            \