diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:10 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:10 +0000 |
| commit | 37da329ed6a7fd7d5c874ff99b9fc3a18e9c7c64 (patch) | |
| tree | d7344c4c6c98338998e31f3f2a2017f615e886bf /arch/arm64/kvm/mmu.c | |
| parent | 09162bc32c880a791c6c0668ce0745cf7958f576 (diff) | |
| parent | 90c1f934ed7141a6d4c202936d12faaeb405fb66 (diff) | |
Merge branch 'kvm-arm64/el2-pc' into kvmarm-master/next
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 1a01da9fdc99..1f41173e6149 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1016,7 +1016,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_vcpu_trap_il_is32bit(vcpu)); + kvm_incr_pc(vcpu); ret = 1; goto out_unlock; } |