Merge branch 'mptcp-support-changes-to-initial-subflow-priority'

[linux-2.6-microblaze.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index b12a364..e4f03a6 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1284,11 +1284,10 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,
 {
        int zone_nid = zone_to_nid(zone);
        phys_addr_t spa, epa;
-       int nid;
 
        __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                         &memblock.memory, &memblock.reserved,
-                        &spa, &epa, &nid);
+                        &spa, &epa, NULL);
 
        while (*idx != U64_MAX) {
                unsigned long epfn = PFN_DOWN(epa);
@@ -1315,7 +1314,7 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,
 
                __next_mem_range(idx, zone_nid, MEMBLOCK_NONE,
                                 &memblock.memory, &memblock.reserved,
-                                &spa, &epa, &nid);
+                                &spa, &epa, NULL);
        }
 
        /* signal end of iteration */