summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2024-02-14 13:18:14 +0000
committerOliver Upton <oliver.upton@linux.dev>2024-02-19 17:13:00 +0000
commit7fd498f473f121db10997d720628423e6538f3b7 (patch)
treedb196d04dd63f8f7d0b6f537d198b715e93c5c40 /arch
parent89bc63fabc8af0897b7ed4fb127006c205dc622c (diff)
downloadlinux-stable-7fd498f473f121db10997d720628423e6538f3b7.tar.gz
linux-stable-7fd498f473f121db10997d720628423e6538f3b7.tar.bz2
linux-stable-7fd498f473f121db10997d720628423e6538f3b7.zip
KVM: arm64: Always populate the trap configuration xarray
As we are going to rely more and more on the global xarray that contains the trap configuration, always populate it, even in the non-NV case. Reviewed-by: Joey Gouly <joey.gouly@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20240214131827.2856277-14-maz@kernel.org Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kvm/sys_regs.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 70043bd78cd4..57f3d0c53fc3 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -3995,8 +3995,5 @@ int __init kvm_sys_reg_table_init(void)
if (!first_idreg)
return -EINVAL;
- if (kvm_get_mode() == KVM_MODE_NV)
- return populate_nv_trap_config();
-
- return 0;
+ return populate_nv_trap_config();
}