Skip to content

Commit bc25378

Browse files
committed
arm64/mm: Drop setting PTE_TYPE_PAGE in pte_mkcont()
JIRA: https://issues.redhat.com/browse/RHEL-78135 commit ced8417 Author: Anshuman Khandual <anshuman.khandual@arm.com> Date: Mon Nov 4 09:46:17 2024 +0530 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 <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: Anshuman Khandual <anshuman.khandual@arm.com> Link: https://lore.kernel.org/r/20241104041617.3804617-1-anshuman.khandual@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Luiz Capitulino <luizcap@redhat.com>
1 parent 6c00390 commit bc25378

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)