Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2010-07-06 15:38:58 -07:00
parent b693fffb18
commit 35a1f0bd07
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
arch/sparc/mm/init_64.c
View file

@ -785,8 +785,7 @@ static int find_node(unsigned long addr)
return -1; return -1;
} }
static unsigned long long nid_range(unsigned long long start, u64 memblock_nid_range(u64 start, u64 end, int *nid)
unsigned long long end, int *nid)
{ {
*nid = find_node(start); *nid = find_node(start);
start += PAGE_SIZE; start += PAGE_SIZE;
@ -804,8 +803,7 @@ static unsigned long long nid_range(unsigned long long start,
return start; return start;
} }
#else #else
static unsigned long long nid_range(unsigned long long start, u64 memblock_nid_range(u64 start, u64 end, int *nid)
unsigned long long end, int *nid)
{ {
*nid = 0; *nid = 0;
return end; return end;
@ -822,8 +820,7 @@ static void __init allocate_node_data(int nid)
struct pglist_data *p; struct pglist_data *p;
#ifdef CONFIG_NEED_MULTIPLE_NODES #ifdef CONFIG_NEED_MULTIPLE_NODES
paddr = memblock_alloc_nid(sizeof(struct pglist_data), paddr = memblock_alloc_nid(sizeof(struct pglist_data), SMP_CACHE_BYTES, nid);
SMP_CACHE_BYTES, nid, nid_range);
if (!paddr) { if (!paddr) {
prom_printf("Cannot allocate pglist_data for nid[%d]\n", nid); prom_printf("Cannot allocate pglist_data for nid[%d]\n", nid);
prom_halt(); prom_halt();
@ -843,8 +840,7 @@ static void __init allocate_node_data(int nid)
if (p->node_spanned_pages) { if (p->node_spanned_pages) {
num_pages = bootmem_bootmap_pages(p->node_spanned_pages); num_pages = bootmem_bootmap_pages(p->node_spanned_pages);
paddr = memblock_alloc_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid, paddr = memblock_alloc_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid);
nid_range);
if (!paddr) { if (!paddr) {
prom_printf("Cannot allocate bootmap for nid[%d]\n", prom_printf("Cannot allocate bootmap for nid[%d]\n",
nid); nid);
@ -984,7 +980,7 @@ static void __init add_node_ranges(void)
unsigned long this_end; unsigned long this_end;
int nid; int nid;
this_end = nid_range(start, end, &nid); this_end = memblock_nid_range(start, end, &nid);
numadbg("Adding active range nid[%d] " numadbg("Adding active range nid[%d] "
"start[%lx] end[%lx]\n", "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; unsigned long this_end;
int n; int n;
this_end = nid_range(start, end, &n); this_end = memblock_nid_range(start, end, &n);
if (n == nid) { if (n == nid) {
numadbg(" MATCH reserving range [%lx:%lx]\n", numadbg(" MATCH reserving range [%lx:%lx]\n",
start, this_end); start, this_end);

7
include/linux/memblock.h
View file

@ -46,8 +46,7 @@ extern long memblock_add(u64 base, u64 size);
extern long memblock_remove(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_free(u64 base, u64 size);
extern long __init memblock_reserve(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, extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid);
u64 (*nid_range)(u64, u64, int *));
extern u64 __init memblock_alloc(u64 size, u64 align); extern u64 __init memblock_alloc(u64 size, u64 align);
extern u64 __init memblock_alloc_base(u64 size, extern u64 __init memblock_alloc_base(u64 size,
u64, u64 max_addr); u64, u64 max_addr);
@ -63,6 +62,10 @@ extern int memblock_is_region_reserved(u64 base, u64 size);
extern void memblock_dump_all(void); extern void memblock_dump_all(void);
/* Provided by the architecture */
extern u64 memblock_nid_range(u64 start, u64 end, int *nid);
/* /*
* pfn conversion functions * pfn conversion functions
* *

13
mm/memblock.c
View file

@ -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, static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,
u64 (*nid_range)(u64, u64, int *),
u64 size, u64 align, int nid) u64 size, u64 align, int nid)
{ {
u64 start, end; u64 start, end;
@ -332,7 +331,7 @@ static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,
u64 this_end; u64 this_end;
int this_nid; int this_nid;
this_end = nid_range(start, end, &this_nid); this_end = memblock_nid_range(start, end, &this_nid);
if (this_nid == nid) { if (this_nid == nid) {
u64 ret = memblock_alloc_nid_unreserved(start, this_end, u64 ret = memblock_alloc_nid_unreserved(start, this_end,
size, align); size, align);
@ -345,8 +344,7 @@ static u64 __init memblock_alloc_nid_region(struct memblock_region *mp,
return ~(u64)0; return ~(u64)0;
} }
u64 __init memblock_alloc_nid(u64 size, u64 align, int nid, u64 __init memblock_alloc_nid(u64 size, u64 align, int nid)
u64 (*nid_range)(u64 start, u64 end, int *nid))
{ {
struct memblock_type *mem = &memblock.memory; struct memblock_type *mem = &memblock.memory;
int i; int i;
@ -357,7 +355,6 @@ u64 __init memblock_alloc_nid(u64 size, u64 align, int nid,
for (i = 0; i < mem->cnt; i++) { for (i = 0; i < mem->cnt; i++) {
u64 ret = memblock_alloc_nid_region(&mem->regions[i], u64 ret = memblock_alloc_nid_region(&mem->regions[i],
nid_range,
size, align, nid); size, align, nid);
if (ret != ~(u64)0) if (ret != ~(u64)0)
return ret; return ret;
@ -531,3 +528,9 @@ int memblock_is_region_reserved(u64 base, u64 size)
return memblock_overlaps_region(&memblock.reserved, base, size) >= 0; return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;
} }
u64 __weak memblock_nid_range(u64 start, u64 end, int *nid)
{
*nid = 0;
return end;
}