Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751912AbbKKCDc (ORCPT ); Tue, 10 Nov 2015 21:03:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45968 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbbKKCDb (ORCPT ); Tue, 10 Nov 2015 21:03:31 -0500 From: Laura Abbott To: Catalin Marinas , Will Deacon , Ard Biesheuvel Cc: Laura Abbott , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: Fix STRICT_MM_TYPECHECKS errors from pgprot Date: Tue, 10 Nov 2015 18:03:20 -0800 Message-Id: <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: 1720 Lines: 51 Several accesses of pgprot values are incorrect when compiled with STRICT_MM_TYPECHECKS. Use the appropriate pgprot_val/__pgprot wrappers to access the structures appropriately. Signed-off-by: Laura Abbott --- Found while working on the set_memory_* work --- arch/arm64/mm/mmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index c2fa6b5..83a1162 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -146,7 +146,7 @@ static void alloc_init_pte(pmd_t *pmd, unsigned long addr, if (((addr | next | phys) & ~CONT_MASK) == 0) { /* a block of CONT_PTES */ __populate_init_pte(pte, addr, next, phys, - prot | __pgprot(PTE_CONT)); + __pgprot(pgprot_val(prot) | PTE_CONT)); } else { /* * If the range being split is already inside of a @@ -475,7 +475,7 @@ void mark_rodata_ro(void) { create_mapping_late(__pa(_stext), (unsigned long)_stext, (unsigned long)_etext - (unsigned long)_stext, - PAGE_KERNEL_EXEC | PTE_RDONLY); + __pgprot(pgprot_val(PAGE_KERNEL_EXEC) | PTE_RDONLY)); } #endif @@ -691,7 +691,7 @@ void __set_fixmap(enum fixed_addresses idx, void *__init fixmap_remap_fdt(phys_addr_t dt_phys) { const u64 dt_virt_base = __fix_to_virt(FIX_FDT); - pgprot_t prot = PAGE_KERNEL | PTE_RDONLY; + pgprot_t prot = __pgprot(pgprot_val(PAGE_KERNEL) | PTE_RDONLY); int size, offset; void *dt_virt; -- 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/