Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbbKKCDo (ORCPT ); Tue, 10 Nov 2015 21:03:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45990 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751957AbbKKCDk (ORCPT ); Tue, 10 Nov 2015 21:03:40 -0500 From: Laura Abbott To: Christoffer Dall , Marc Zyngier Cc: Laura Abbott , Russell King , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm: kvm: Fix STRICT_MM_TYPECHECK errors Date: Tue, 10 Nov 2015 18:03:21 -0800 Message-Id: <1447207401-12023-2-git-send-email-labbott@fedoraproject.org> In-Reply-To: <1447207401-12023-1-git-send-email-labbott@fedoraproject.org> References: <1447207401-12023-1-git-send-email-labbott@fedoraproject.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1513 Lines: 44 PAGE_S2_DEVICE is a pgprot val and needs to be accessed using the proper accessors. Switch to these accessors to avoid errors with STRICT_MM_TYPECHECK. Signed-off-by: Laura Abbott --- Found in the course of other work --- arch/arm/kvm/mmu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 6984342..43f8162 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -213,7 +213,8 @@ static void unmap_ptes(struct kvm *kvm, pmd_t *pmd, kvm_tlb_flush_vmid_ipa(kvm, addr); /* No need to invalidate the cache for device mappings */ - if ((pte_val(old_pte) & PAGE_S2_DEVICE) != PAGE_S2_DEVICE) + if ((pte_val(old_pte) & pgprot_val(PAGE_S2_DEVICE)) != + pgprot_val(PAGE_S2_DEVICE)) kvm_flush_dcache_pte(old_pte); put_page(virt_to_page(pte)); @@ -306,7 +307,8 @@ static void stage2_flush_ptes(struct kvm *kvm, pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); do { if (!pte_none(*pte) && - (pte_val(*pte) & PAGE_S2_DEVICE) != PAGE_S2_DEVICE) + (pte_val(*pte) & pgprot_val(PAGE_S2_DEVICE)) != + pgprot_val(PAGE_S2_DEVICE)) kvm_flush_dcache_pte(*pte); } while (pte++, addr += PAGE_SIZE, addr != end); } -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/