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/kernel/cpufeature.c | |
| 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/kernel/cpufeature.c')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 540ec508a12f..d41128e37701 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -3509,7 +3509,7 @@ static void verify_hyp_capabilities(void) return; safe_mmfr1 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1); - mmfr0 = read_cpuid(ID_AA64MMFR0_EL1); + mmfr0 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR0_EL1); mmfr1 = read_cpuid(ID_AA64MMFR1_EL1); /* Verify VMID bits */ |