The patch titled
Subject: mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5
has been removed from the -mm tree. Its filename was
mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5.patch
This patch was dropped because it was folded into mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug.patch
------------------------------------------------------
From: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Subject: mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5
rename register_new_memory() to hotplug_memory_register(), per Ingo
Link: http://lkml.kernel.org/r/20180228030308.1116-6-pasha.tatashin@xxxxxxxxxx
Signed-off-by: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Baoquan He <bhe@xxxxxxxxxx>
Cc: Bharata B Rao <bharata@xxxxxxxxxxxxxxxxxx>
Cc: Daniel Jordan <daniel.m.jordan@xxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Steven Sistare <steven.sistare@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/memory.c | 2 +-
include/linux/memory.h | 2 +-
mm/memory_hotplug.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/base/memory.c~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5 drivers/base/memory.c
--- a/drivers/base/memory.c~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5
+++ a/drivers/base/memory.c
@@ -712,7 +712,7 @@ static int add_memory_block(int base_sec
* need an interface for the VM to add new memory regions,
* but without onlining it.
*/
-int register_new_memory(int nid, struct mem_section *section)
+int hotplug_memory_register(int nid, struct mem_section *section)
{
int ret = 0;
struct memory_block *mem;
diff -puN include/linux/memory.h~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5 include/linux/memory.h
--- a/include/linux/memory.h~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5
+++ a/include/linux/memory.h
@@ -109,7 +109,7 @@ extern int register_memory_notifier(stru
extern void unregister_memory_notifier(struct notifier_block *nb);
extern int register_memory_isolate_notifier(struct notifier_block *nb);
extern void unregister_memory_isolate_notifier(struct notifier_block *nb);
-extern int register_new_memory(int, struct mem_section *);
+int hotplug_memory_register(int nid, struct mem_section *section);
#ifdef CONFIG_MEMORY_HOTREMOVE
extern int unregister_memory_section(struct mem_section *);
#endif
diff -puN mm/memory_hotplug.c~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5 mm/memory_hotplug.c
--- a/mm/memory_hotplug.c~mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug-v5
+++ a/mm/memory_hotplug.c
@@ -279,7 +279,7 @@ static int __meminit __add_section(int n
if (!want_memblock)
return 0;
- return register_new_memory(nid, __pfn_to_section(phys_start_pfn));
+ return hotplug_memory_register(nid, __pfn_to_section(phys_start_pfn));
}
/*
_
Patches currently in -mm which might be from pasha.tatashin@xxxxxxxxxx are
mm-disable-interrupts-while-initializing-deferred-pages.patch
mm-initialize-pages-on-demand-during-boot.patch
mm-memory_hotplug-enforce-block-size-aligned-range-check.patch
x86-mm-memory_hotplug-determine-block-size-based-on-the-end-of-boot-memory.patch
mm-uninitialized-struct-page-poisoning-sanity-checking.patch
mm-memory_hotplug-optimize-probe-routine.patch
mm-memory_hotplug-dont-read-nid-from-struct-page-during-hotplug.patch
mm-memory_hotplug-optimize-memory-hotplug.patch
mm-memory_hotplug-optimize-memory-hotplug-v5.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
