commit b37670b0f37d8015d0d428e6a63bd07397430a2f
author Marc Zyngier <marc.zyngier@arm.com> Tue Sep 18 11:37:28 2012 +0100
committer Christoffer Dall <cdall@cs.columbia.edu> Wed Mar 06 15:48:42 2013 -0800
tree 8bc2b42b3be447effbc077ff832e139cd38d81e2
parent 78abfcde49e0e454cabf8e56cd4c1591752e2706

ARM: KVM: abstract S1TW abort detection 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 e4682a3..6495c1c 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -71,7 +71,7 @@
 		return 1;
 	}
 
-	if ((kvm_vcpu_get_hsr(vcpu) >> 7) & 1) {
+	if (kvm_vcpu_dabt_iss1tw(vcpu)) {
 		/* page table accesses IO mem: tell guest to fix its TTBR */
 		kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu));
 		return 1;