From: Will Deacon <will@kernel.org>
Date: Sun, 14 Jun 2026 11:17:33 +0000 (+0100)
Subject: Merge branch 'for-next/mm' into for-next/core
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=df3daf49a8a05751b34ec40c46ac6d9c47e9ec22;p=thirdparty%2Flinux.git

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

* for-next/mm: (24 commits)
  Revert "arm64: mm: Unmap kernel data/bss entirely from the linear map"
  Revert "arm64: mm: Defer remap of linear alias of data/bss"
  arm64/mm: Rename ptdesc_t
  arm64: mm: Defer remap of linear alias of data/bss
  KVM: arm64: Omit tag sync on stage-2 mappings of the zero page
  arm64: Avoid double evaluation of __ptep_get()
  kasan: Move generic KASAN page tables out of BSS too
  arm64: Rename page table BSS section to .bss..pgtbl
  arm64: mm: Unmap kernel data/bss entirely from the linear map
  arm64: mm: Map the kernel data/bss read-only in the linear map
  mm: Make empty_zero_page[] const
  sh: Drop cache flush of the zero page at boot
  powerpc/code-patching: Avoid r/w mapping of the zero page
  arm64: mm: Don't abuse memblock NOMAP to check for overlaps
  arm64: Move fixmap and kasan page tables to end of kernel image
  arm64: mm: Permit contiguous attribute for preliminary mappings
  arm64: kfence: Avoid NOMAP tricks when mapping the early pool
  arm64: mm: Permit contiguous descriptors to be manipulated
  arm64: mm: Preserve non-contiguous descriptors when mapping DRAM
  arm64: mm: Preserve existing table mappings when mapping DRAM
  ...
---

df3daf49a8a05751b34ec40c46ac6d9c47e9ec22
diff --cc arch/arm64/include/asm/linkage.h
index 73eabc82a6bb2,8637f667667c1..d1f7a16729d25
--- a/arch/arm64/include/asm/linkage.h
+++ b/arch/arm64/include/asm/linkage.h
@@@ -43,6 -43,6 +43,8 @@@
  	SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)	\
  	bti c ;
  
 +#define _THIS_IP_ ({ unsigned long __ip; asm volatile("adr %0, ." : "=r" (__ip)); __ip; })
 +
+ #define __bss_pgtbl __section(".bss..pgtbl") __aligned(PAGE_SIZE)
+ 
  #endif