diff options
author | Marc Zyngier <maz@kernel.org> | 2019-06-29 01:05:38 +0300 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-07-07 11:28:38 +0300 |
commit | 98909e6d1c811b6368c9c84fa6b3f0817c32ac2f (patch) | |
tree | b5b8b570f69dfeb474d6fe72b4ed6c61603a0009 /arch/arm64/kvm/inject_fault.c | |
parent | e47c2055c68e06977d7d8b7dbc2f7468a36d3658 (diff) | |
download | linux-98909e6d1c811b6368c9c84fa6b3f0817c32ac2f.tar.xz |
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/inject_fault.c')
-rw-r--r-- | arch/arm64/kvm/inject_fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index e21fdd93027a..ebfdfc27b2bd 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -64,7 +64,7 @@ static void enter_exception64(struct kvm_vcpu *vcpu, unsigned long target_mode, case PSR_MODE_EL1h: vbar = vcpu_read_sys_reg(vcpu, VBAR_EL1); sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1); - vcpu_write_elr_el1(vcpu, *vcpu_pc(vcpu)); + vcpu_write_sys_reg(vcpu, *vcpu_pc(vcpu), ELR_EL1); break; default: /* Don't do that */ |