Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / arch / sh / mm / init.c

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 105f559..3385b28 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -224,7 +224,6 @@ static void __init bootmem_init_one_node(unsigned int nid)
        unsigned long total_pages, paddr;
        unsigned long end_pfn;
        struct pglist_data *p;
-       int i;
 
        p = NODE_DATA(nid);
 
@@ -250,11 +249,12 @@ static void __init bootmem_init_one_node(unsigned int nid)
         * reservations in other nodes.
         */
        if (nid == 0) {
+               struct memblock_region *reg;
+
                /* Reserve the sections we're already using. */
-               for (i = 0; i < memblock.reserved.cnt; i++)
-                       reserve_bootmem(memblock.reserved.region[i].base,
-                                       memblock_size_bytes(&memblock.reserved, i),
-                                       BOOTMEM_DEFAULT);
+               for_each_memblock(reserved, reg) {
+                       reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT);
+               }
        }
 
        sparse_memory_present_with_active_regions(nid);
@@ -262,13 +262,14 @@ static void __init bootmem_init_one_node(unsigned int nid)
 
 static void __init do_init_bootmem(void)
 {
+       struct memblock_region *reg;
        int i;
 
        /* Add active regions with valid PFNs. */
-       for (i = 0; i < memblock.memory.cnt; i++) {
+       for_each_memblock(memory, reg) {
                unsigned long start_pfn, end_pfn;
-               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);
        }