* [merged mm-stable] mm-page_alloc-move-mirrored_kernelcore-into-mm_initc.patch removed from -mm tree
@ 2023-06-09 23:27 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2023-06-09 23:27 UTC (permalink / raw)
To: mm-commits, yzaikin, ying.huang, rppt, rafael, pavel, osalvador,
mcgrof, len.brown, keescook, david, wangkefeng.wang, akpm
The quilt patch titled
Subject: mm: page_alloc: move mirrored_kernelcore into mm_init.c
has been removed from the -mm tree. Its filename was
mm-page_alloc-move-mirrored_kernelcore-into-mm_initc.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: Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: mm: page_alloc: move mirrored_kernelcore into mm_init.c
Date: Tue, 16 May 2023 14:38:09 +0800
Patch series "mm: page_alloc: misc cleanup and refactor", v2.
This aims to reduce more space in page_alloc.c, also do some cleanup, no
functional changes intended.
This patch (of 13):
Since commit 9420f89db2dd ("mm: move most of core MM initialization to
mm/mm_init.c"), mirrored_kernelcore should be moved into mm_init.c, as
most related codes are already there.
Link: https://lkml.kernel.org/r/20230516063821.121844-1-wangkefeng.wang@huawei.com
Link: https://lkml.kernel.org/r/20230516063821.121844-2-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/mm_init.c | 2 ++
mm/page_alloc.c | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
--- a/mm/mm_init.c~mm-page_alloc-move-mirrored_kernelcore-into-mm_initc
+++ a/mm/mm_init.c
@@ -259,6 +259,8 @@ static int __init cmdline_parse_core(cha
return 0;
}
+bool mirrored_kernelcore __initdata_memblock;
+
/*
* kernelcore=size sets the amount of memory for use for allocations that
* cannot be reclaimed or migrated.
--- a/mm/page_alloc.c~mm-page_alloc-move-mirrored_kernelcore-into-mm_initc
+++ a/mm/page_alloc.c
@@ -23,7 +23,6 @@
#include <linux/interrupt.h>
#include <linux/pagemap.h>
#include <linux/jiffies.h>
-#include <linux/memblock.h>
#include <linux/compiler.h>
#include <linux/kernel.h>
#include <linux/kasan.h>
@@ -374,8 +373,6 @@ int user_min_free_kbytes = -1;
int watermark_boost_factor __read_mostly = 15000;
int watermark_scale_factor = 10;
-bool mirrored_kernelcore __initdata_memblock;
-
/* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */
int movable_zone;
EXPORT_SYMBOL(movable_zone);
_
Patches currently in -mm which might be from wangkefeng.wang@huawei.com are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-09 23:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-09 23:27 [merged mm-stable] mm-page_alloc-move-mirrored_kernelcore-into-mm_initc.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.