1 files changed, 29 insertions, 39 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index f0434513df15..3fd8e18bed80 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -88,7 +88,7 @@ static void __init read_obp_memory(const char *property,
                                    struct linux_prom64_registers *regs,
                                    int *num_ents)
 {
-        int node = prom_finddevice("/memory");
+        phandle node = prom_finddevice("/memory");
         int prop_size = prom_getproplen(node, property);
         int ents, ret, i;
 
@@ -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_try_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_try_nid(num_pages << PAGE_SHIFT, PAGE_SIZE, nid);
                 if (!paddr) {
                         prom_printf("Cannot allocate bootmap for nid[%d]\n",
                                   nid);
@@ -866,7 +862,7 @@ static void init_node_masks_nonnuma(void)
         for (i = 0; i < NR_CPUS; i++)
                 numa_cpu_lookup_table[i] = 0;
 
-        numa_cpumask_lookup_table[0] = CPU_MASK_ALL;
+        cpumask_setall(&numa_cpumask_lookup_table[0]);
 }
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
@@ -972,19 +968,19 @@ int of_node_to_nid(struct device_node *dp)
 
 static void __init add_node_ranges(void)
 {
-        int i;
+        struct memblock_region *reg;
 
-        for (i = 0; i < memblock.memory.cnt; i++) {
-                unsigned long size = memblock_size_bytes(&memblock.memory, i);
+        for_each_memblock(memory, reg) {
+                unsigned long size = reg->size;
                 unsigned long start, end;
 
-                start = memblock.memory.region[i].base;
+                start = reg->base;
                 end = start + size;
                 while (start < end) {
                         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",
@@ -1084,7 +1080,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md,
 {
         u64 arc;
 
-        cpus_clear(*mask);
+        cpumask_clear(mask);
 
         mdesc_for_each_arc(arc, md, grp, MDESC_ARC_TYPE_BACK) {
                 u64 target = mdesc_arc_target(md, arc);
@@ -1095,7 +1091,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md,
                         continue;
                 id = mdesc_get_property(md, target, "id", NULL);
                 if (*id < nr_cpu_ids)
-                        cpu_set(*id, *mask);
+                        cpumask_set_cpu(*id, mask);
         }
 }
 
@@ -1157,13 +1153,13 @@ static int __init numa_parse_mdesc_group(struct mdesc_handle *md, u64 grp,
 
         numa_parse_mdesc_group_cpus(md, grp, &mask);
 
-        for_each_cpu_mask(cpu, mask)
+        for_each_cpu(cpu, &mask)
                 numa_cpu_lookup_table[cpu] = index;
-        numa_cpumask_lookup_table[index] = mask;
+        cpumask_copy(&numa_cpumask_lookup_table[index], &mask);
 
         if (numa_debug) {
                 printk(KERN_INFO "NUMA GROUP[%d]: cpus [ ", index);
-                for_each_cpu_mask(cpu, mask)
+                for_each_cpu(cpu, &mask)
                         printk("%d ", cpu);
                 printk("]\n");
         }
@@ -1222,7 +1218,7 @@ static int __init numa_parse_jbus(void)
         index = 0;
         for_each_present_cpu(cpu) {
                 numa_cpu_lookup_table[cpu] = index;
-                numa_cpumask_lookup_table[index] = cpumask_of_cpu(cpu);
+                cpumask_copy(&numa_cpumask_lookup_table[index], cpumask_of(cpu));
                 node_masks[index].mask = ~((1UL << 36UL) - 1UL);
                 node_masks[index].val = cpu << 36UL;
 
@@ -1281,7 +1277,7 @@ static void __init bootmem_init_nonnuma(void)
 {
         unsigned long top_of_ram = memblock_end_of_DRAM();
         unsigned long total_ram = memblock_phys_mem_size();
-        unsigned int i;
+        struct memblock_region *reg;
 
         numadbg("bootmem_init_nonnuma()\n");
 
@@ -1292,15 +1288,14 @@ static void __init bootmem_init_nonnuma(void)
 
         init_node_masks_nonnuma();
 
-        for (i = 0; i < memblock.memory.cnt; i++) {
-                unsigned long size = memblock_size_bytes(&memblock.memory, i);
+        for_each_memblock(memory, reg) {
                 unsigned long start_pfn, end_pfn;
 
-                if (!size)
+                if (!reg->size)
                         continue;
 
-                start_pfn = memblock.memory.region[i].base >> PAGE_SHIFT;
-                end_pfn = start_pfn + memblock_size_pages(&memblock.memory, i);
+                start_pfn = memblock_region_memory_base_pfn(reg);
+                end_pfn = memblock_region_memory_end_pfn(reg);
                 add_active_range(0, start_pfn, end_pfn);
         }
 
@@ -1318,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);
@@ -1334,17 +1329,12 @@ static void __init reserve_range_in_node(int nid, unsigned long start,
 
 static void __init trim_reserved_in_node(int nid)
 {
-        int i;
+        struct memblock_region *reg;
 
         numadbg("  trim_reserved_in_node(%d)\n", nid);
 
-        for (i = 0; i < memblock.reserved.cnt; i++) {
-                unsigned long start = memblock.reserved.region[i].base;
-                unsigned long size = memblock_size_bytes(&memblock.reserved, i);
-                unsigned long end = start + size;
-
-                reserve_range_in_node(nid, start, end);
-        }
+        for_each_memblock(reserved, reg)
+                reserve_range_in_node(nid, reg->base, reg->base + reg->size);
 }
 
 static void __init bootmem_init_one_node(int nid)
@@ -1635,7 +1625,7 @@ static void __init sun4v_ktsb_init(void)
                 ktsb_descr[0].pgsz_idx = HV_PGSZ_IDX_4MB;
                 ktsb_descr[0].pgsz_mask = HV_PGSZ_MASK_4MB;
                 break;
-        };
+        }
 
         ktsb_descr[0].assoc = 1;
         ktsb_descr[0].num_ttes = KERNEL_TSB_NENTRIES;
@@ -2276,7 +2266,7 @@ unsigned long pte_sz_bits(unsigned long sz)
                         return _PAGE_SZ512K_4V;
                 case 4 * 1024 * 1024:
                         return _PAGE_SZ4MB_4V;
-                };
+                }
         } else {
                 switch (sz) {
                 case 8 * 1024:
@@ -2288,7 +2278,7 @@ unsigned long pte_sz_bits(unsigned long sz)
                         return _PAGE_SZ512K_4U;
                 case 4 * 1024 * 1024:
                         return _PAGE_SZ4MB_4U;
-                };
+                }
         }
 }