From: Will Deacon <will@kernel.org>
Date: Wed, 24 Sep 2025 15:34:34 +0000 (+0100)
Subject: Merge branch 'for-next/mm' into for-next/core
X-Git-Tag: v6.18-rc1~210^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77dfca70baefcb988318a72fe69eb99f6dabbbb1;p=thirdparty%2Flinux.git

Merge branch 'for-next/mm' into for-next/core

* for-next/mm:
  arm64: map [_text, _stext) virtual address range non-executable+read-only
  arm64: Enable vmalloc-huge with ptdump
  arm64: mm: split linear mapping if BBML2 unsupported on secondary CPUs
  arm64: mm: support large block mapping when rodata=full
  arm64: Enable permission change on arm64 kernel block mappings
  arm64/Kconfig: Remove CONFIG_RODATA_FULL_DEFAULT_ENABLED
  arm64: mm: Rework the 'rodata=' options
  arm64: mm: Represent physical memory with phys_addr_t and resource_size_t
  arm64: mm: Make map_fdt() return mapped pointer
  arm64: mm: Cast start/end markers to char *, not u64
---

77dfca70baefcb988318a72fe69eb99f6dabbbb1
diff --cc arch/arm64/kernel/cpufeature.c
index 08a7d706620eb,3780f343fd2c6..5dabb349986c7
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@@ -84,8 -84,8 +84,9 @@@
  #include <asm/hwcap.h>
  #include <asm/insn.h>
  #include <asm/kvm_host.h>
 +#include <asm/mmu.h>
  #include <asm/mmu_context.h>
+ #include <asm/mmu.h>
  #include <asm/mte.h>
  #include <asm/hypervisor.h>
  #include <asm/processor.h>
diff --cc arch/arm64/mm/mmu.c
index 1838015207404,10c2580995814..3a444a5fe4696
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@@ -47,6 -49,15 +49,8 @@@
  #define NO_CONT_MAPPINGS	BIT(1)
  #define NO_EXEC_MAPPINGS	BIT(2)	/* assumes FEAT_HPDS is not used */
  
 -enum pgtable_type {
 -	TABLE_PTE,
 -	TABLE_PMD,
 -	TABLE_PUD,
 -	TABLE_P4D,
 -};
 -
+ DEFINE_STATIC_KEY_FALSE(arm64_ptdump_lock_key);
+ 
  u64 kimage_voffset __ro_after_init;
  EXPORT_SYMBOL(kimage_voffset);