drivers/base/node: rename register_memory_blocks_under_node() and remove context...

The function register_memory_blocks_under_node() is now only called from
the memory hotplug path, as register_memory_blocks_under_node_early()
handles registration during early boot.  Therefore, the context argument
used to differentiate between early boot and hotplug is no longer needed
and was removed.

Since the function is only called from the hotplug path, we renamed
register_memory_blocks_under_node() to
register_memory_blocks_under_node_hotplug()

Link: https://lkml.kernel.org/r/907c22292b0ee4975107876efc875c75c11badd9.1748452242.git.donettom@linux.ibm.com
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Acked-by: Oscar Salvador <osalvador@suse.de>
Acked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 24c32cdbe97daaae4fa6555bc07087914dfbbbe3..302cb99853ddf72e33f0497b011e293ad832c14d 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -839,9 +839,8 @@ static void register_memory_blocks_under_nodes(void)
        }
 }
 
-void register_memory_blocks_under_node(int nid, unsigned long start_pfn,
-                                      unsigned long end_pfn,
-                                      enum meminit_context context)
+void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn,
+                                              unsigned long end_pfn)
 {
        walk_memory_blocks(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn),
                           (void *)&nid, register_mem_block_under_node_hotplug);

diff --git a/include/linux/node.h b/include/linux/node.h
index b15de78e04087fc300392a46a2a5339902c72b7e..75b036a100d2c6a986076111c11c1ae41b553a44 100644 (file)
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -111,13 +111,12 @@ struct memory_block;
 extern struct node *node_devices[];
 
 #if defined(CONFIG_MEMORY_HOTPLUG) && defined(CONFIG_NUMA)
-void register_memory_blocks_under_node(int nid, unsigned long start_pfn,
-                                      unsigned long end_pfn,
-                                      enum meminit_context context);
+void register_memory_blocks_under_node_hotplug(int nid, unsigned long start_pfn,
+                                              unsigned long end_pfn);
 #else
-static inline void register_memory_blocks_under_node(int nid, unsigned long start_pfn,
-                                                    unsigned long end_pfn,
-                                                    enum meminit_context context)
+static inline void register_memory_blocks_under_node_hotplug(int nid,
+                                                            unsigned long start_pfn,
+                                                            unsigned long end_pfn)
 {
 }
 static inline void register_memory_blocks_under_nodes(void)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index b1caedbade5b166363c9926d98adb98d6e711528..c6ce1aba64e6c1abe10b1b8bb4a8e9a555b2bb65 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1575,9 +1575,8 @@ int add_memory_resource(int nid, struct resource *res, mhp_t mhp_flags)
                BUG_ON(ret);
        }
 
-       register_memory_blocks_under_node(nid, PFN_DOWN(start),
-                                         PFN_UP(start + size - 1),
-                                         MEMINIT_HOTPLUG);
+       register_memory_blocks_under_node_hotplug(nid, PFN_DOWN(start),
+                                         PFN_UP(start + size - 1));
 
        /* create new memmap entry */
        if (!strcmp(res->name, "System RAM"))