commit 23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea
author Marc Zyngier <marc.zyngier@arm.com> Tue Sep 18 12:07:06 2012 +0100
committer Christoffer Dall <cdall@cs.columbia.edu> Wed Mar 06 15:48:43 2013 -0800
tree c5d736a85f1840beaf17f534b16182acedcfefdf
parent a7123377e7107a5f4f7ae198aa5b5000c9362871

ARM: KVM: abstract IL decoding away

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

arch/arm/kvm/mmio.c

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 0b8f499..02ca765 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -101,7 +101,7 @@
 	 * The MMIO instruction is emulated and should not be re-executed
 	 * in the guest.
 	 */
-	kvm_skip_instr(vcpu, (kvm_vcpu_get_hsr(vcpu) >> 25) & 1);
+	kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));
 	return 0;
 }