1 files changed, 6 insertions, 10 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index dd68025ecdbe..0883113624b9 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -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);