arch/x86/mm/numa.c: use for_each_memblock()

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 1d045f9c390fd356474541830fd82eb0441006b6..a32b706c401add2e47943cf1650ca63f26b8c1ae 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -559,7 +559,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
        int i, nid;
        nodemask_t numa_kernel_nodes = NODE_MASK_NONE;
        unsigned long start, end;
-       struct memblock_type *type = &memblock.reserved;
+       struct memblock_region *r;
 
        /*
         * At this time, all memory regions reserved by memblock are
@@ -573,8 +573,8 @@ static void __init numa_clear_kernel_node_hotplug(void)
        }
 
        /* Mark all kernel nodes. */
-       for (i = 0; i < type->cnt; i++)
-               node_set(type->regions[i].nid, numa_kernel_nodes);
+       for_each_memblock(reserved, r)
+               node_set(r->nid, numa_kernel_nodes);
 
        /* Clear MEMBLOCK_HOTPLUG flag for memory in kernel nodes. */
        for (i = 0; i < numa_meminfo.nr_blks; i++) {