diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-10-14 09:29:27 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-10 08:34:24 +0000 |
| commit | cdb5e02ed133731f8a6676a389ed40ca303cab7c (patch) | |
| tree | 0b4e7d3d329cbe902aaacd80b76e9c3282956806 /arch/arm64/kvm/mmu.c | |
| parent | 6ddbc281e2aa21c5917e015a373958455f5eb3c1 (diff) | |
KVM: arm64: Make kvm_skip_instr() and co private to HYP
In an effort to remove the vcpu PC manipulations from EL1 on nVHE
systems, move kvm_skip_instr() to be HYP-specific. EL1's intent
to increment PC post emulation is now signalled via a flag in the
vcpu structure.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 0bec07cf8d06..2ecd0c5622a6 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1014,7 +1014,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) * cautious, and skip the instruction. */ if (kvm_is_error_hva(hva) && kvm_vcpu_dabt_is_cm(vcpu)) { - kvm_skip_instr(vcpu); + kvm_incr_pc(vcpu); ret = 1; goto out_unlock; } |