The patch titled
Subject: mm/page_alloc: introduce free_area_init_core_hotplug
has been removed from the -mm tree. Its filename was
mm-page_alloc-introduce-free_area_init_core_hotplug-v6.patch
This patch was dropped because it was folded into mm-page_alloc-introduce-free_area_init_core_hotplug.patch
------------------------------------------------------
From: Oscar Salvador <osalvador@xxxxxxx>
Subject: mm/page_alloc: introduce free_area_init_core_hotplug
v6
Link: http://lkml.kernel.org/r/20180801122348.21588-6-osalvador@xxxxxxxxxxxxxxxxxx
Signed-off-by: Oscar Salvador <osalvador@xxxxxxx>
Reviewed-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Pasha Tatashin <Pavel.Tatashin@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memory_hotplug.h | 1 +
include/linux/mm.h | 4 ----
mm/page_alloc.c | 5 +++--
3 files changed, 4 insertions(+), 6 deletions(-)
--- a/include/linux/memory_hotplug.h~mm-page_alloc-introduce-free_area_init_core_hotplug-v6
+++ a/include/linux/memory_hotplug.h
@@ -319,6 +319,7 @@ static inline int offline_pages(unsigned
static inline void remove_memory(int nid, u64 start, u64 size) {}
#endif /* CONFIG_MEMORY_HOTREMOVE */
+extern void __ref free_area_init_core_hotplug(int nid);
extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
void *arg, int (*func)(struct memory_block *, void *));
extern int add_memory(int nid, u64 start, u64 size);
--- a/include/linux/mm.h~mm-page_alloc-introduce-free_area_init_core_hotplug-v6
+++ a/include/linux/mm.h
@@ -2019,10 +2019,6 @@ extern void __init free_area_init_node(i
unsigned long zone_start_pfn, unsigned long *zholes_size);
extern void free_initmem(void);
-#ifdef CONFIG_MEMORY_HOTPLUG
-extern void __ref free_area_init_core_hotplug(int nid);
-#endif
-
/*
* Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK)
* into the buddy system. The freed pages will be poisoned with pattern
--- a/mm/page_alloc.c~mm-page_alloc-introduce-free_area_init_core_hotplug-v6
+++ a/mm/page_alloc.c
@@ -6178,7 +6178,7 @@ void __init set_pageblock_order(void)
#endif /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */
static unsigned long __init calc_memmap_size(unsigned long spanned_pages,
- unsigned long present_pages)
+ unsigned long present_pages)
{
unsigned long pages = spanned_pages;
@@ -6231,6 +6231,7 @@ static void pgdat_init_kcompactd(struct
static void __meminit pgdat_init_internals(struct pglist_data *pgdat)
{
pgdat_resize_init(pgdat);
+
pgdat_init_numabalancing(pgdat);
pgdat_init_split_queue(pgdat);
pgdat_init_kcompactd(pgdat);
@@ -6243,7 +6244,7 @@ static void __meminit pgdat_init_interna
lruvec_init(node_lruvec(pgdat));
}
-static void __paginginit zone_init_internals(struct zone *zone, enum zone_type idx, int nid,
+static void __meminit zone_init_internals(struct zone *zone, enum zone_type idx, int nid,
unsigned long remaining_pages)
{
zone->managed_pages = remaining_pages;
_
Patches currently in -mm which might be from osalvador@xxxxxxx are
mm-remove-zone_id-and-make-use-of-zone_idx-in-is_dev_zone.patch
mm-page_alloc-move-ifdefery-out-of-free_area_init_core.patch
mm-page_alloc-inline-function-to-handle-config_deferred_struct_page_init.patch
mm-page_alloc-introduce-free_area_init_core_hotplug.patch
mm-fix-comment-for-nodemask_alloc.patch
