]> git.ipfire.org Git - thirdparty/linux.git/commit
arch, mm: consolidate empty_zero_page
authorMike Rapoport (Microsoft) <rppt@kernel.org>
Wed, 11 Feb 2026 10:31:40 +0000 (12:31 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 5 Apr 2026 20:53:01 +0000 (13:53 -0700)
commit6215d9f4470fbb48245ffdfade821685e2728c65
tree6aac4b909ea423bbc23bec5d399cf740c7f27004
parent9a1d0c738b45ea8da4e6897099c708e89f43daad
arch, mm: consolidate empty_zero_page

Reduce 22 declarations of empty_zero_page to 3 and 23 declarations of
ZERO_PAGE() to 4.

Every architecture defines empty_zero_page that way or another, but for the
most of them it is always a page aligned page in BSS and most definitions
of ZERO_PAGE do virt_to_page(empty_zero_page).

Move Linus vetted x86 definition of empty_zero_page and ZERO_PAGE() to the
core MM and drop these definitions in architectures that do not implement
colored zero page (MIPS and s390).

ZERO_PAGE() remains a macro because turning it to a wrapper for a static
inline causes severe pain in header dependencies.

For the most part the change is mechanical, with these being noteworthy:

* alpha: aliased empty_zero_page with ZERO_PGE that was also used for boot
  parameters. Switching to a generic empty_zero_page removes the aliasing
  and keeps ZERO_PGE for boot parameters only
* arm64: uses __pa_symbol() in ZERO_PAGE() so that definition of
  ZERO_PAGE() is kept intact.
* m68k/parisc/um: allocated empty_zero_page from memblock,
  although they do not support zero page coloring and having it in BSS
  will work fine.
* sparc64 can have empty_zero_page in BSS rather allocate it, but it
  can't use virt_to_page() for BSS. Keep it's definition of ZERO_PAGE()
  but instead of allocating it, make mem_map_zero point to
  empty_zero_page.
* sh: used empty_zero_page for boot parameters at the very early boot.
  Rename the parameters page to boot_params_page and let sh use the generic
  empty_zero_page.
* hexagon: had an amusing comment about empty_zero_page

/* A handy thing to have if one has the RAM. Declared in head.S */

  that unfortunately had to go :)

Link: https://lkml.kernel.org/r/20260211103141.3215197-4-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: Helge Deller <deller@gmx.de> [parisc]
Tested-by: Helge Deller <deller@gmx.de> [parisc]
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Magnus Lindholm <linmag7@gmail.com> [alpha]
Acked-by: Dinh Nguyen <dinguyen@kernel.org> [nios2]
Acked-by: Andreas Larsson <andreas@gaisler.com> [sparc]
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Acked-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
59 files changed:
arch/alpha/include/asm/pgtable.h
arch/arc/include/asm/pgtable.h
arch/arc/mm/init.c
arch/arm/include/asm/pgtable.h
arch/arm/mm/mmu.c
arch/arm/mm/nommu.c
arch/arm64/include/asm/pgtable.h
arch/arm64/mm/mmu.c
arch/csky/include/asm/pgtable.h
arch/csky/mm/init.c
arch/hexagon/include/asm/pgtable.h
arch/hexagon/kernel/head.S
arch/hexagon/kernel/hexagon_ksyms.c
arch/loongarch/include/asm/pgtable.h
arch/loongarch/mm/init.c
arch/m68k/include/asm/pgtable_mm.h
arch/m68k/include/asm/pgtable_no.h
arch/m68k/mm/init.c
arch/m68k/mm/mcfmmu.c
arch/m68k/mm/motorola.c
arch/m68k/mm/sun3mmu.c
arch/microblaze/include/asm/pgtable.h
arch/microblaze/kernel/head.S
arch/microblaze/kernel/microblaze_ksyms.c
arch/nios2/include/asm/pgtable.h
arch/nios2/kernel/head.S
arch/nios2/kernel/nios2_ksyms.c
arch/openrisc/include/asm/pgtable.h
arch/openrisc/kernel/head.S
arch/openrisc/kernel/or32_ksyms.c
arch/openrisc/mm/init.c
arch/parisc/include/asm/pgtable.h
arch/parisc/mm/init.c
arch/powerpc/include/asm/pgtable.h
arch/powerpc/mm/mem.c
arch/riscv/include/asm/pgtable.h
arch/riscv/mm/init.c
arch/sh/include/asm/pgtable.h
arch/sh/include/asm/setup.h
arch/sh/kernel/head_32.S
arch/sh/kernel/sh_ksyms_32.c
arch/sh/mm/init.c
arch/sparc/include/asm/pgtable_32.h
arch/sparc/include/asm/setup.h
arch/sparc/kernel/head_32.S
arch/sparc/mm/init_32.c
arch/sparc/mm/init_64.c
arch/um/include/asm/pgtable.h
arch/um/include/shared/kern_util.h
arch/um/kernel/mem.c
arch/um/kernel/um_arch.c
arch/x86/include/asm/pgtable.h
arch/x86/kernel/head_32.S
arch/x86/kernel/head_64.S
arch/xtensa/include/asm/pgtable.h
arch/xtensa/kernel/head.S
arch/xtensa/kernel/xtensa_ksyms.c
include/linux/pgtable.h
mm/mm_init.c