From feb96a2688d8ea30d140b2be493e97a2faf01089 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
Date: Tue, 18 Sep 2012 14:14:35 +0100
Subject: [PATCH] --- yaml --- r: 372083 b: refs/heads/master c:
 1cc287dd081235e02cebd791f1e930ca6f422dcd h: refs/heads/master i:   372081:
 1e6c90e511ff58e10e4f023d1db61c195f0f346c   372079:
 f7e2b605a2a1e532f5e9aef202160fff6f89ed65 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/include/asm/kvm_emulate.h | 5 +++++
 trunk/arch/arm/kvm/mmu.c                 | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2cd25403dd87..cdcd96f6223e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4926d445eb76bec8ebd71f5ed9e9c94fd738014d
+refs/heads/master: 1cc287dd081235e02cebd791f1e930ca6f422dcd
diff --git a/trunk/arch/arm/include/asm/kvm_emulate.h b/trunk/arch/arm/include/asm/kvm_emulate.h
index 539f83ac167f..021a59c46dda 100644
--- a/trunk/arch/arm/include/asm/kvm_emulate.h
+++ b/trunk/arch/arm/include/asm/kvm_emulate.h
@@ -147,4 +147,9 @@ static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu)
 	return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
 }
 
+static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)
+{
+	return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/trunk/arch/arm/kvm/mmu.c b/trunk/arch/arm/kvm/mmu.c
index 41fa75df107f..e00f28d2670c 100644
--- a/trunk/arch/arm/kvm/mmu.c
+++ b/trunk/arch/arm/kvm/mmu.c
@@ -601,7 +601,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
 			      kvm_vcpu_get_hfar(vcpu), fault_ipa);
 
 	/* Check the stage-2 fault is trans. fault or write fault */
-	fault_status = (kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE);
+	fault_status = kvm_vcpu_trap_get_fault(vcpu);
 	if (fault_status != FSC_FAULT && fault_status != FSC_PERM) {
 		kvm_err("Unsupported fault status: EC=%#lx DFCS=%#lx\n",
 			hsr_ec, fault_status);