ARM: KVM: abstract IL decoding away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 6626c7e62371..31616336255c 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -624,8 +624,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
                  * that fail their condition code check"
                  */
                 if (!kvm_condition_valid(vcpu)) {
-                        bool is_wide = kvm_vcpu_get_hsr(vcpu) & HSR_IL;
-                        kvm_skip_instr(vcpu, is_wide);
+                        kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
                         return 1;
                 }