Commit 69e944b1 authored by Donet Tom's avatar Donet Tom Committed by Andrew Morton
Browse files

drivers/base/node: remove register_mem_block_under_node_early() 

The function register_mem_block_under_node_early() is no longer used, as
register_memory_blocks_under_node_early() now handles memory block
registration during early boot.

Removed register_mem_block_under_node_early() and get_nid_for_pfn(), the
latter was only used by the former.

Link: https://lkml.kernel.org/r/22e0c5d20f1d33a91d0436ad22d96628cf084d1b.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 4f745def

drivers/base/node.c

+1 −57
Original line number Diff line number Diff line
@@ -757,15 +757,6 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

static int __ref get_nid_for_pfn(unsigned long pfn)

{

#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

	if (system_state < SYSTEM_RUNNING)

		return early_pfn_to_nid(pfn);

#endif

	return pfn_to_nid(pfn);

}



static void do_register_memory_block_under_node(int nid,

						struct memory_block *mem_blk,

						enum meminit_context context)
@@ -792,46 +783,6 @@ static void do_register_memory_block_under_node(int nid, 
				    ret);

}



/* register memory section under specified node if it spans that node */

static int register_mem_block_under_node_early(struct memory_block *mem_blk,

					       void *arg)

{

	unsigned long memory_block_pfns = memory_block_size_bytes() / PAGE_SIZE;

	unsigned long start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);

	unsigned long end_pfn = start_pfn + memory_block_pfns - 1;

	int nid = *(int *)arg;

	unsigned long pfn;



	for (pfn = start_pfn; pfn <= end_pfn; pfn++) {

		int page_nid;



		/*

		 * memory block could have several absent sections from start.

		 * skip pfn range from absent section

		 */

		if (!pfn_in_present_section(pfn)) {

			pfn = round_down(pfn + PAGES_PER_SECTION,

					 PAGES_PER_SECTION) - 1;

			continue;

		}



		/*

		 * We need to check if page belongs to nid only at the boot

		 * case because node's ranges can be interleaved.

		 */

		page_nid = get_nid_for_pfn(pfn);

		if (page_nid < 0)

			continue;

		if (page_nid != nid)

			continue;



		do_register_memory_block_under_node(nid, mem_blk, MEMINIT_EARLY);

		return 0;

	}

	/* mem section does not span the specified node */

	return 0;

}



/*

 * During hotplug we know that all pages in the memory block belong to the same

 * node.
@@ -892,15 +843,8 @@ void register_memory_blocks_under_node(int nid, unsigned long start_pfn, 
				       unsigned long end_pfn,

				       enum meminit_context context)

{

	walk_memory_blocks_func_t func;



	if (context == MEMINIT_HOTPLUG)

		func = register_mem_block_under_node_hotplug;

	else

		func = register_mem_block_under_node_early;



	walk_memory_blocks(PFN_PHYS(start_pfn), PFN_PHYS(end_pfn - start_pfn),

			   (void *)&nid, func);

			   (void *)&nid, register_mem_block_under_node_hotplug);

	return;

}

#endif /* CONFIG_MEMORY_HOTPLUG */