memblock: Don't allow archs to override memblock_nid_range() (f9b18db3) · Commits · 戴 / test

memblock_nid_range() is used to implement memblock_[try_]alloc_nid(). The generic version determines the range by walking early_node_map with for_each_mem_pfn_range(). The generic version is defined __weak to allow arch override. Currently, only sparc overrides it; however, with the previous update to the generic implementation, there isn't much to be gained with arch override. Sparc would behave exactly the same with the generic implementation. This patch disallows arch override for memblock_nid_range() and make both generic and sparc versions static. sparc is only compile tested. Signed-off-by:

Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1310460395-30913-6-git-send-email-tj@kernel.org Cc: "David S. Miller" <davem@davemloft.net> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by:

H. Peter Anvin <hpa@linux.intel.com>

arch/sparc/mm/init_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -785,7 +785,7 @@ static int find_node(unsigned long addr)
		return -1;
		}

		u64 memblock_nid_range(u64 start, u64 end, int *nid)
		static u64 memblock_nid_range(u64 start, u64 end, int *nid)
		{
		*nid = find_node(start);
		start += PAGE_SIZE;
		@@ -803,7 +803,7 @@ u64 memblock_nid_range(u64 start, u64 end, int *nid)
		return start;
		}
		#else
		u64 memblock_nid_range(u64 start, u64 end, int *nid)
		static u64 memblock_nid_range(u64 start, u64 end, int *nid)
		{
		*nid = 0;
		return end;

include/linux/memblock.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ extern int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
		extern void memblock_dump_all(void);

		/* Provided by the architecture */
		extern phys_addr_t memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid);
		extern int memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
		phys_addr_t addr2, phys_addr_t size2);

mm/memblock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align)
		* have been done to populate it.
		*/

		phys_addr_t __weak __init memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid)
		static phys_addr_t __init memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid)
		{
		#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
		unsigned long start_pfn, end_pfn;

Admin message