aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorEmil Medve <Emilian.Medve@Freescale.com>2014-06-04 19:08:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 19:54:05 -0400
commitaf4459d3636790735fccd83f0337c8380a0a4cc2 (patch)
tree610a8d0d69f1925c4fc8c3816db3558a7a8e3322 /arch/x86/mm
parentb46e14acb816038bda92f6aa0dd2c4554fe64d24 (diff)
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>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/numa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 1d045f9c390f..a32b706c401a 100644
--- 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)
559 int i, nid; 559 int i, nid;
560 nodemask_t numa_kernel_nodes = NODE_MASK_NONE; 560 nodemask_t numa_kernel_nodes = NODE_MASK_NONE;
561 unsigned long start, end; 561 unsigned long start, end;
562 struct memblock_type *type = &memblock.reserved; 562 struct memblock_region *r;
563 563
564 /* 564 /*
565 * At this time, all memory regions reserved by memblock are 565 * At this time, all memory regions reserved by memblock are
@@ -573,8 +573,8 @@ static void __init numa_clear_kernel_node_hotplug(void)
573 } 573 }
574 574
575 /* Mark all kernel nodes. */ 575 /* Mark all kernel nodes. */
576 for (i = 0; i < type->cnt; i++) 576 for_each_memblock(reserved, r)
577 node_set(type->regions[i].nid, numa_kernel_nodes); 577 node_set(r->nid, numa_kernel_nodes);
578 578
579 /* Clear MEMBLOCK_HOTPLUG flag for memory in kernel nodes. */ 579 /* Clear MEMBLOCK_HOTPLUG flag for memory in kernel nodes. */
580 for (i = 0; i < numa_meminfo.nr_blks; i++) { 580 for (i = 0; i < numa_meminfo.nr_blks; i++) {