diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-06-28 23:05:38 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-07 09:28:38 +0100 |
| commit | 98909e6d1c811b6368c9c84fa6b3f0817c32ac2f (patch) | |
| tree | b5b8b570f69dfeb474d6fe72b4ed6c61603a0009 /arch/arm64/kvm/guest.c | |
| parent | e47c2055c68e06977d7d8b7dbc2f7468a36d3658 (diff) | |
| download | lwn-98909e6d1c811b6368c9c84fa6b3f0817c32ac2f.tar.gz lwn-98909e6d1c811b6368c9c84fa6b3f0817c32ac2f.zip | |
KVM: arm64: Move ELR_EL1 to the system register array
As ELR-EL1 is a VNCR-capable register with ARMv8.4-NV, let's move it to
the sys_regs array and repaint the accessors. While we're at it, let's
kill the now useless accessors used only on the fault injection path.
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/guest.c')
| -rw-r--r-- | arch/arm64/kvm/guest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index 9dd5bbeefae6..99ff09ad24e8 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -132,7 +132,7 @@ static void *core_reg_addr(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) return &vcpu->arch.ctxt.sp_el1; case KVM_REG_ARM_CORE_REG(elr_el1): - return &vcpu->arch.ctxt.elr_el1; + return __ctxt_sys_reg(&vcpu->arch.ctxt, ELR_EL1); case KVM_REG_ARM_CORE_REG(spsr[0]) ... KVM_REG_ARM_CORE_REG(spsr[KVM_NR_SPSR - 1]): |