diff options
| author | Will Deacon <will@kernel.org> | 2022-12-06 11:21:21 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-12-06 11:21:21 +0000 |
| commit | c947948f7aa4fc8ffca598866f1955fad2860b72 (patch) | |
| tree | 373f043e4580b61a0276abfc9d7a88badb9e1590 /arch/arm64/include/asm/pgtable.h | |
| parent | 37f5d61a96a16431549f7c0641086b4a9bb52601 (diff) | |
| parent | 453dfcee70c5c344ca09396ff5b0baf177eb327e (diff) | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: booting: Require placement within 48-bit addressable memory
arm64: mm: kfence: only handle translation faults
arm64/mm: Simplify and document pte_to_phys() for 52 bit addresses
Diffstat (limited to 'arch/arm64/include/asm/pgtable.h')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index fe76e5823d91..8ef2a03ee553 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -77,11 +77,11 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; static inline phys_addr_t __pte_to_phys(pte_t pte) { return (pte_val(pte) & PTE_ADDR_LOW) | - ((pte_val(pte) & PTE_ADDR_HIGH) << 36); + ((pte_val(pte) & PTE_ADDR_HIGH) << PTE_ADDR_HIGH_SHIFT); } static inline pteval_t __phys_to_pte_val(phys_addr_t phys) { - return (phys | (phys >> 36)) & PTE_ADDR_MASK; + return (phys | (phys >> PTE_ADDR_HIGH_SHIFT)) & PTE_ADDR_MASK; } #else #define __pte_to_phys(pte) (pte_val(pte) & PTE_ADDR_MASK) |