hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/IBV2E4 -------------------------------- If ACTLR_XCALL_XINT not set, the following issue occurs as val is not used without ACTLR_XCALL_XINT, so fix it by moving it into CONFIG_ACTLR_XCALL_XINT controlled code. arch/arm64/kvm/sys_regs.c: In function ‘access_actlr’: arch/arm64/kvm/sys_regs.c:283:26: warning: unused variable ‘val’ [-Wunused-variable] 283 | u64 mask, shift, val; | ^~~ Fixes: bd2967e62cdf ("arm64: Fix actlr_el1 can not set problem in guest") Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com> --- arch/arm64/kvm/sys_regs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 73d5102e7a10..ded8d28d10a8 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -280,11 +280,11 @@ static bool access_actlr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) { - u64 mask, shift, val; + u64 mask, shift; #ifdef CONFIG_ACTLR_XCALL_XINT if (p->is_write) { - val = vcpu_read_sys_reg(vcpu, r->reg); + u64 val = vcpu_read_sys_reg(vcpu, r->reg); val &= ~(ACTLR_ELx_XCALL | ACTLR_ELx_XINT); val |= (p->regval & (ACTLR_ELx_XCALL | ACTLR_ELx_XINT)); vcpu_write_sys_reg(vcpu, val, r->reg); -- 2.34.1