Skip to content

Commit ced8417

Browse files
Anshuman Khandualctmarinas
authored andcommitted
arm64/mm: Drop setting PTE_TYPE_PAGE in pte_mkcont()
PTE_TYPE_PAGE bits were being set in pte_mkcont() because PTE_TABLE_BIT was being cleared in pte_mkhuge(). But after arch_make_huge_pte() modification in commit f819281 ("arm64/mm: Re-organize arch_make_huge_pte()"), which dropped pte_mkhuge() completely, setting back PTE_TYPE_PAGE bits is no longer necessary. Change pte_mkcont() to only set PTE_CONT. Cc: Will Deacon <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: Mark Rutland <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Anshuman Khandual <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 263e22d commit ced8417

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/arm64/include/asm/pgtable.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,7 @@ static inline pte_t pte_mkspecial(pte_t pte)
265265

266266
static inline pte_t pte_mkcont(pte_t pte)
267267
{
268-
pte = set_pte_bit(pte, __pgprot(PTE_CONT));
269-
return set_pte_bit(pte, __pgprot(PTE_TYPE_PAGE));
268+
return set_pte_bit(pte, __pgprot(PTE_CONT));
270269
}
271270

272271
static inline pte_t pte_mknoncont(pte_t pte)

0 commit comments

Comments
 (0)