diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-10-13 12:14:38 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-10 09:34:24 +0100 |
| commit | 6ddbc281e2aa21c5917e015a373958455f5eb3c1 (patch) | |
| tree | d7f2dbabe42217481059dd62157b08ff5fef52eb /arch/arm64/kvm/mmu.c | |
| parent | KVM: arm64: Don't adjust PC on SError during SMC trap (diff) | |
| download | linux-6ddbc281e2aa21c5917e015a373958455f5eb3c1.tar.xz linux-6ddbc281e2aa21c5917e015a373958455f5eb3c1.zip | |
KVM: arm64: Move kvm_vcpu_trap_il_is32bit into kvm_skip_instr32()
There is no need to feed the result of kvm_vcpu_trap_il_is32bit()
to kvm_skip_instr(), as only AArch32 has a variable length ISA, and
this helper can equally be called from kvm_skip_instr32(), reducing
the complexity at all the call sites.
Acked-by: Mark Rutland <mark.rutland@arm.com>
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 57972bdb213a..0bec07cf8d06 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_vcpu_trap_il_is32bit(vcpu)); + kvm_skip_instr(vcpu); ret = 1; goto out_unlock; } |