commit 4a1df28ac0ce6d76d336210d8c4216087c17de3a
author Marc Zyngier <marc.zyngier@arm.com> Tue Sep 18 11:06:23 2012 +0100
committer Christoffer Dall <cdall@cs.columbia.edu> Wed Mar 06 15:48:42 2013 -0800
tree 8723b5efb5b009066869dc575c876e88e3eb7df4
parent 7393b599177d301d4c9ca2c7f69a6849aba793c7

ARM: KVM: abstract HSR_ISV away

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

arch/arm/include/asm/kvm_emulate.h

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index 3c01988..ae9119e 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -90,4 +90,9 @@
 	return vcpu->arch.fault.hyp_pc;
 }
 
+static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
+{
+	return kvm_vcpu_get_hsr(vcpu) & HSR_ISV;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */

arch/arm/kvm/mmio.c

diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index ce63f39..41f96e9 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -130,7 +130,7 @@
 	 * space do its magic.
 	 */
 
-	if (kvm_vcpu_get_hsr(vcpu) & HSR_ISV) {
+	if (kvm_vcpu_dabt_isvalid(vcpu)) {
 		ret = decode_hsr(vcpu, fault_ipa, &mmio);
 		if (ret)
 			return ret;