Commit de7fb8d3 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas
Browse files

arm64/mm: Change protval as 'pteval_t' in map_range() 



pgprot_t has been defined as an encapsulated structure with pteval_t as its
element. Hence it is prudent to use pteval_t as the type instead of via the
size based u64. Besides pteval_t type might be different size later on with
FEAT_D128.

Cc: Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Link: https://lore.kernel.org/r/20241111075249.609493-1-anshuman.khandual@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent bdf94836

arch/arm64/kernel/pi/map_range.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void __init map_range(u64 *pte, u64 start, u64 end, u64 pa, pgprot_t prot, 
		      int level, pte_t *tbl, bool may_use_cont, u64 va_offset)

{

	u64 cmask = (level == 3) ? CONT_PTE_SIZE - 1 : U64_MAX;

	u64 protval = pgprot_val(prot) & ~PTE_TYPE_MASK;

	pteval_t protval = pgprot_val(prot) & ~PTE_TYPE_MASK;

	int lshift = (3 - level) * (PAGE_SHIFT - 3);

	u64 lmask = (PAGE_SIZE << lshift) - 1;