From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/12] arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort
Date: Sat, 18 Oct 2014 12:57:01 +0100 [thread overview]
Message-ID: <1413633422-14907-12-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1413633422-14907-1-git-send-email-marc.zyngier@arm.com>
From: Steve Capper <steve.capper@linaro.org>
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>
---
arch/arm/kvm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 8c40829..57a403a 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));
}
--
2.1.1
next prev parent reply other threads:[~2014-10-18 11:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-18 11:56 [GIT PULL] Second pull request for KVM on arm/arm64 for 3.18 Marc Zyngier
2014-10-18 11:56 ` [PATCH 01/12] arm: kvm: fix CPU hotplug Marc Zyngier
2014-10-18 11:56 ` [PATCH 02/12] ARM: KVM: fix vgic-disabled build Marc Zyngier
2014-10-18 11:56 ` [PATCH 03/12] arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages Marc Zyngier
2014-10-18 11:56 ` [PATCH 04/12] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() Marc Zyngier
2014-10-18 11:56 ` [PATCH 05/12] arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap Marc Zyngier
2014-10-18 11:56 ` [PATCH 06/12] ARM: kvm: define PAGE_S2_DEVICE as read-only by default Marc Zyngier
2014-10-18 11:56 ` [PATCH 07/12] arm64: " Marc Zyngier
2014-10-18 11:56 ` [PATCH 08/12] arm/arm64: KVM: map MMIO regions at creation time Marc Zyngier
2014-10-18 11:56 ` [PATCH 09/12] arm64: KVM: Implement 48 VA support for KVM EL2 and Stage-2 Marc Zyngier
2014-10-18 11:57 ` [PATCH 10/12] arm/arm64: KVM: Ensure memslots are within KVM_PHYS_SIZE Marc Zyngier
2014-10-18 11:57 ` Marc Zyngier [this message]
2014-10-18 11:57 ` [PATCH 12/12] arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413633422-14907-12-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).