Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35a1f0bd authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock: Remove nid_range argument, arch provides memblock_nid_range() instead 



Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent b693fffb

arch/sparc/mm/init_64.c

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

}



static unsigned long long nid_range(unsigned long long start,

				    unsigned long long end, int *nid)

u64 memblock_nid_range(u64 start, u64 end, int *nid)

{

	*nid = find_node(start);

	start += PAGE_SIZE;
@@ -804,8 +803,7 @@ static unsigned long long nid_range(unsigned long long start, 
	return start;

}

#else

static unsigned long long nid_range(unsigned long long start,

				    unsigned long long end, int *nid)

u64 memblock_nid_range(u64 start, u64 end, int *nid)

{

	*nid = 0;

	return end;
@@ -822,8 +820,7 @@ static void __init allocate_node_data(int nid) 
	struct pglist_data *p;



#ifdef CONFIG_NEED_MULTIPLE_NODES

	paddr = memblock_alloc_nid(sizeof(struct pglist_data),

			      SMP_CACHE_BYTES, nid, nid_range);

	paddr = memblock_alloc_nid(sizeof(struct pglist_data), SMP_CACHE_BYTES, nid);

	if (!paddr) {

		prom_printf("Cannot allocate pglist_data for nid[%d]\n", nid);

		prom_halt();
@@ -843,8 +840,7 @@ static void __init allocate_node_data(int nid) 
	if (p->node_spanned_pages) {

		num_pages = bootmem_bootmap_pages(p->node_spanned_pages);



		paddr = memblock_alloc_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid,

				      nid_range);

		paddr = memblock_alloc_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid);

		if (!paddr) {

			prom_printf("Cannot allocate bootmap for nid[%d]\n",

				  nid);
@@ -984,7 +980,7 @@ static void __init add_node_ranges(void) 
			unsigned long this_end;

			int nid;



			this_end = nid_range(start, end, &nid);

			this_end = memblock_nid_range(start, end, &nid);



			numadbg("Adding active range nid[%d] "

				"start[%lx] end[%lx]\n",
@@ -1317,7 +1313,7 @@ static void __init reserve_range_in_node(int nid, unsigned long start, 
		unsigned long this_end;

		int n;



		this_end = nid_range(start, end, &n);

		this_end = memblock_nid_range(start, end, &n);

		if (n == nid) {

			numadbg("      MATCH reserving range [%lx:%lx]\n",

				start, this_end);

include/linux/memblock.h

+5 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ extern long memblock_add(u64 base, u64 size); 
extern long memblock_remove(u64 base, u64 size);

extern long __init memblock_free(u64 base, u64 size);

extern long __init memblock_reserve(u64 base, u64 size);

extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid,

				u64 (*nid_range)(u64, u64, int *));

extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid);

extern u64 __init memblock_alloc(u64 size, u64 align);

extern u64 __init memblock_alloc_base(u64 size,

		u64, u64 max_addr);
@@ -63,6 +62,10 @@ extern int memblock_is_region_reserved(u64 base, u64 size); 


extern void memblock_dump_all(void);



/* Provided by the architecture */

extern u64 memblock_nid_range(u64 start, u64 end, int *nid);





/*

 * pfn conversion functions

 *

mm/memblock.c

+8 −5
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ static u64 __init memblock_alloc_nid_unreserved(u64 start, u64 end, 
}



static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,

				       u64 (*nid_range)(u64, u64, int *),

				       u64 size, u64 align, int nid)

{

	u64 start, end;
@@ -332,7 +331,7 @@ static u64 __init memblock_alloc_nid_region(struct memblock_region *mp, 
		u64 this_end;

		int this_nid;



		this_end = nid_range(start, end, &this_nid);

		this_end = memblock_nid_range(start, end, &this_nid);

		if (this_nid == nid) {

			u64 ret = memblock_alloc_nid_unreserved(start, this_end,

							   size, align);
@@ -345,8 +344,7 @@ static u64 __init memblock_alloc_nid_region(struct memblock_region *mp, 
	return ~(u64)0;

}



u64 __init memblock_alloc_nid(u64 size, u64 align, int nid,

			 u64 (*nid_range)(u64 start, u64 end, int *nid))

u64 __init memblock_alloc_nid(u64 size, u64 align, int nid)

{

	struct memblock_type *mem = &memblock.memory;

	int i;
@@ -357,7 +355,6 @@ u64 __init memblock_alloc_nid(u64 size, u64 align, int nid, 


	for (i = 0; i < mem->cnt; i++) {

		u64 ret = memblock_alloc_nid_region(&mem->regions[i],

					       nid_range,

					       size, align, nid);

		if (ret != ~(u64)0)

			return ret;
@@ -531,3 +528,9 @@ int memblock_is_region_reserved(u64 base, u64 size) 
	return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;

}



u64 __weak memblock_nid_range(u64 start, u64 end, int *nid)

{

	*nid = 0;



	return end;

}