initmm-fold-late-call-to-page_ext_init-to-page_alloc_init_late.patch removed from -mm tree
The quilt patch titled
Subject: init,mm: fold late call to page_ext_init() to page_alloc_init_late()
has been removed from the -mm tree. Its filename was
initmm-fold-late-call-to-page_ext_init-to-page_alloc_init_late.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (IBM)" <[email protected]>
Subject: init,mm: fold late call to page_ext_init() to page_alloc_init_late()
Date: Tue, 21 Mar 2023 19:05:09 +0200
When deferred initialization of struct pages is enabled, page_ext_init() must be called after all the deferred initialization is done, but there is no point to keep it a separate call from kernel_init_freeable() right after page_alloc_init_late().
Fold the call to page_ext_init() into page_alloc_init_late() and localize deferred_struct_pages variable.
---
include/linux/page_ext.h | 2 -- init/main.c | 4 ---- mm/mm_init.c | 6 +++++- 3 files changed, 5 insertions(+), 7 deletions(-)
include/linux/page_ext.h renamed from include/linux/page_ext.h~initmm-fold-late-call-to-page_ext_init-to-page_alloc_init_late +0 -2
@@ -29,8 +29,6 @@ struct page_ext_operations {bool need_shared_flags; }; -extern bool deferred_struct_pages; -#ifdef CONFIG_PAGE_EXTENSION /*
init/main.c renamed from init/main.c~initmm-fold-late-call-to-page_ext_init-to-page_alloc_init_late +0 -4
@@ -62,7 +62,6 @@#include <linux/rmap.h> #include <linux/mempolicy.h> #include <linux/key.h> -#include <linux/page_ext.h> #include <linux/debug_locks.h> #include <linux/debugobjects.h> #include <linux/lockdep.h>
@@ -1565,9 +1564,6 @@ static noinline void __init kernel_init_padata_init ();page_alloc_init_late (); -/* Initialize page ext after all struct pages are initialized. */ -if (deferred_struct_pages) -page_ext_init ();do_basic_setup ();
mm/mm_init.c renamed from mm/mm_init.c~initmm-fold-late-call-to-page_ext_init-to-page_alloc_init_late +5 -1
@@ -225,7 +225,7 @@ static unsigned long nr_kernel_pages __istatic unsigned long nr_all_pages__initdata ;static unsigned long dma_reserve__initdata ; -bool deferred_struct_pages__meminitdata ; +static bool deferred_struct_pages__meminitdata ; static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats);
@@ -2358,6 +2358,10 @@ void __init page_alloc_init_late(void)for_each_populated_zone (zone)set_zone_contiguous (zone); + +/* Initialize page ext after all struct pages are initialized. */ +if (deferred_struct_pages) +page_ext_init (); }#ifndef __HAVE_ARCH_RESERVED_KERNEL_PAGES
_
Patches currently in -mm which might be from [email protected] are
arm-reword-arch_force_max_order-prompt-and-help-text.patch arm64-drop-ranges-in-definition-of-arch_force_max_order.patch arm64-reword-arch_force_max_order-prompt-and-help-text.patch arm64-reword-arch_force_max_order-prompt-and-help-text-v3.patch csky-drop-arch_force_max_order.patch ia64-dont-allow-users-to-override-arch_force_max_order.patch m68k-reword-arch_force_max_order-prompt-and-help-text.patch nios2-reword-arch_force_max_order-prompt-and-help-text.patch nios2-drop-ranges-for-definition-of-arch_force_max_order.patch powerpc-reword-arch_force_max_order-prompt-and-help-text.patch powerpc-drop-ranges-for-definition-of-arch_force_max_order.patch sh-reword-arch_force_max_order-prompt-and-help-text.patch sh-reword-arch_force_max_order-prompt-and-help-text-v3.patch sh-drop-ranges-for-definition-of-arch_force_max_order.patch sh-drop-ranges-for-definition-of-arch_force_max_order-v3.patch sparc-reword-arch_force_max_order-prompt-and-help-text.patch xtensa-reword-arch_force_max_order-prompt-and-help-text.patch mm-move-free_area_empty-to-mm-internalh.patch