summaryrefslogtreecommitdiff
path: root/arch/arm/kvm/mmio.c
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2012-09-18 15:07:06 +0400
committerChristoffer Dall <cdall@cs.columbia.edu>2013-03-07 03:48:43 +0400
commit23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea (patch)
treec5d736a85f1840beaf17f534b16182acedcfefdf /arch/arm/kvm/mmio.c
parenta7123377e7107a5f4f7ae198aa5b5000c9362871 (diff)
downloadlinux-23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea.tar.xz
ARM: KVM: abstract IL decoding away
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <cdall@cs.columbia.edu>
Diffstat (limited to 'arch/arm/kvm/mmio.c')
-rw-r--r--arch/arm/kvm/mmio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 0b8f49985b70..02ca76555bd4 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -101,7 +101,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
* 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;
}