| Message ID | 20230508071200.123962-2-wangkefeng.wang@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mm: page_alloc: misc cleanup and refector | expand |
On Mon, May 08, 2023 at 03:11:49PM +0800, Kefeng Wang wrote: > 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. > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org> > --- > mm/mm_init.c | 2 ++ > mm/page_alloc.c | 3 --- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/mm/mm_init.c b/mm/mm_init.c > index 7f7f9c677854..da162b7a044c 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -259,6 +259,8 @@ static int __init cmdline_parse_core(char *p, unsigned long *core, > return 0; > } > > +bool mirrored_kernelcore __initdata_memblock; > + > /* > * kernelcore=size sets the amount of memory for use for allocations that > * cannot be reclaimed or migrated. > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index af9c995d3c1e..d1086aeca8f2 100644 > --- a/mm/page_alloc.c > +++ b/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); > -- > 2.35.3 >
diff --git a/mm/mm_init.c b/mm/mm_init.c index 7f7f9c677854..da162b7a044c 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -259,6 +259,8 @@ static int __init cmdline_parse_core(char *p, unsigned long *core, return 0; } +bool mirrored_kernelcore __initdata_memblock; + /* * kernelcore=size sets the amount of memory for use for allocations that * cannot be reclaimed or migrated. diff --git a/mm/page_alloc.c b/mm/page_alloc.c index af9c995d3c1e..d1086aeca8f2 100644 --- a/mm/page_alloc.c +++ b/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);
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. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- mm/mm_init.c | 2 ++ mm/page_alloc.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)