Commit 10f09d82 authored by Donet Tom's avatar Donet Tom Committed by Andrew Morton
Browse files

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

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: default avatarDonet Tom <donettom@linux.ibm.com>
Acked-by: default avatarOscar Salvador <osalvador@suse.de>
Acked-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarZi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ac24f6cd

drivers/base/node.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/node.h

+5 −6
Original line number Diff line number Diff line
@@ -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)

mm/memory_hotplug.c

+2 −3
Original line number Diff line number Diff line
@@ -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"))