diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2012-09-18 13:07:06 +0200 |
---|---|---|
committer | Christoffer Dall <cdall@cs.columbia.edu> | 2013-03-07 00:48:43 +0100 |
commit | 23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea (patch) | |
tree | c5d736a85f1840beaf17f534b16182acedcfefdf /arch/arm/kvm/coproc.c | |
parent | ARM: KVM: abstract SAS decoding away (diff) | |
download | linux-23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea.tar.xz linux-23b415d61a80c0c63f43dd2b3a08a1fa0b79b8ea.zip |
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/coproc.c')
-rw-r--r-- | arch/arm/kvm/coproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index b30591615da4..94eee8befc83 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -293,7 +293,7 @@ static int emulate_cp15(struct kvm_vcpu *vcpu, if (likely(r->access(vcpu, params, r))) { /* Skip instruction, since it was emulated */ - kvm_skip_instr(vcpu, (kvm_vcpu_get_hsr(vcpu) >> 25) & 1); + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); return 1; } /* If access function fails, it should complain. */ |