diff options
| author | Will Deacon <will@kernel.org> | 2025-01-17 13:52:33 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2025-01-17 13:52:33 +0000 |
| commit | 602ffd4ce3a61526d72dfbfb76ca06df19d429f1 (patch) | |
| tree | c28117d800dd5e23b1317105fe1450ebec06d1c7 /arch/arm64/include/asm/pgtable.h | |
| parent | 6e1173306ed57025e86aa461aac872ae65539cc4 (diff) | |
| parent | 9ab2601dc4c145279dc518bca00349dc1abe77ed (diff) | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: mm: Test for pmd_sect() in vmemmap_check_pmd()
arm64/mm: Replace open encodings with PXD_TABLE_BIT
arm64/mm: Rename pte_mkpresent() as pte_mkvalid()
arm64: Kconfig: force ARM64_PAN=y when enabling TTBR0 sw PAN
arm64/kvm: Avoid invalid physical addresses to signal owner updates
arm64/kvm: Configure HYP TCR.PS/DS based on host stage1
arm64/mm: Override PARange for !LPA2 and use it consistently
arm64/mm: Reduce PA space to 48 bits when LPA2 is not enabled
Diffstat (limited to 'arch/arm64/include/asm/pgtable.h')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index f8dac6673887..0b2a2ad1b9e8 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -273,7 +273,7 @@ static inline pte_t pte_mknoncont(pte_t pte) return clear_pte_bit(pte, __pgprot(PTE_CONT)); } -static inline pte_t pte_mkpresent(pte_t pte) +static inline pte_t pte_mkvalid(pte_t pte) { return set_pte_bit(pte, __pgprot(PTE_VALID)); } |