summaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorSteve Capper <steve.capper@linaro.org>2014-10-14 15:02:15 +0100
committerChristoffer Dall <christoffer.dall@linaro.org>2014-10-15 11:25:22 +0200
commit3d08c629244257473450a8ba17cb8184b91e68f8 (patch)
tree91b6f68965261368c58a48d42cc285378a4cd295 /arch/arm/kvm
parentc3058d5da2222629bc2223c488a4512b59bb4baf (diff)
downloadblackbird-op-linux-3d08c629244257473450a8ba17cb8184b91e68f8.tar.gz
blackbird-op-linux-3d08c629244257473450a8ba17cb8184b91e68f8.zip
arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort
Commit: b886576 ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping introduced some code in user_mem_abort that failed to compile if STRICT_MM_TYPECHECKS was enabled. This patch fixes up the failing comparison. Signed-off-by: Steve Capper <steve.capper@linaro.org> Reviewed-by: Kim Phillips <kim.phillips@linaro.org> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 8c40829d4a52..57a403a5c22b 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -930,7 +930,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
}
coherent_cache_guest_page(vcpu, hva, PAGE_SIZE);
ret = stage2_set_pte(kvm, memcache, fault_ipa, &new_pte,
- mem_type == PAGE_S2_DEVICE);
+ pgprot_val(mem_type) == pgprot_val(PAGE_S2_DEVICE));
}
OpenPOWER on IntegriCloud