diff options
| author | Will Deacon <will@kernel.org> | 2023-08-25 12:36:18 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2023-08-25 12:36:18 +0100 |
| commit | 7abb3e4ee0d1cbd19defcb366611ae472f34298f (patch) | |
| tree | 1c7b02efd2bd6d454b02faed6d702ac5db38328f /arch/arm64/kernel | |
| parent | 438ddc3c4255dc43f726a2207d37954188b63241 (diff) | |
| parent | 4e0bacd65e72f7f9b1b60e48e85e6d4187474644 (diff) | |
| download | linux-7abb3e4ee0d1cbd19defcb366611ae472f34298f.tar.gz linux-7abb3e4ee0d1cbd19defcb366611ae472f34298f.tar.bz2 linux-7abb3e4ee0d1cbd19defcb366611ae472f34298f.zip | |
Merge branch 'for-next/mm' into for-next/core
* for-next/mm:
arm64: fix build warning for ARM64_MEMSTART_SHIFT
arm64: Remove unsued extern declaration init_mem_pgprot()
arm64/mm: Set only the PTE_DIRTY bit while preserving the HW dirty state
arm64/mm: Add pte_rdonly() helper
arm64/mm: Directly use ID_AA64MMFR2_EL1_VARange_MASK
arm64/mm: Replace an open coding with ID_AA64MMFR1_EL1_HAFDBS_MASK
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 757a0de07f91..7b236994f0e1 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -113,7 +113,7 @@ SYM_CODE_START(primary_entry) */ #if VA_BITS > 48 mrs_s x0, SYS_ID_AA64MMFR2_EL1 - tst x0, #0xf << ID_AA64MMFR2_EL1_VARange_SHIFT + tst x0, ID_AA64MMFR2_EL1_VARange_MASK mov x0, #VA_BITS mov x25, #VA_BITS_MIN csel x25, x25, x0, eq @@ -756,7 +756,7 @@ SYM_FUNC_START(__cpu_secondary_check52bitva) b.ne 2f mrs_s x0, SYS_ID_AA64MMFR2_EL1 - and x0, x0, #(0xf << ID_AA64MMFR2_EL1_VARange_SHIFT) + and x0, x0, ID_AA64MMFR2_EL1_VARange_MASK cbnz x0, 2f update_early_cpu_boot_status \ |