diff options
author | Tejun Heo <tj@kernel.org> | 2011-12-08 13:22:09 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-12-08 13:22:09 -0500 |
commit | 9d15ffc824a90842b16592f3a960836841bd6c58 (patch) | |
tree | 92509b0477ef7c72a823f3a17dd5635d9c1ff0e5 /arch/mips/sgi-ip27 | |
parent | 98e4ae8af0055816747d1e8ad727f69bbfd9f7d0 (diff) |
mips: Use HAVE_MEMBLOCK_NODE_MAP
mips used early_node_map[] just to prime free_area_init_nodes(). Now
memblock can be used for the same purpose and early_node_map[] is
scheduled to be dropped. Use memblock instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-mips@linux-mips.org
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index bc1297109cc5..b105eca3c020 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -12,6 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/memblock.h> | ||
15 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
16 | #include <linux/mmzone.h> | 17 | #include <linux/mmzone.h> |
17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
@@ -381,8 +382,8 @@ static void __init szmem(void) | |||
381 | continue; | 382 | continue; |
382 | } | 383 | } |
383 | num_physpages += slot_psize; | 384 | num_physpages += slot_psize; |
384 | add_active_range(node, slot_getbasepfn(node, slot), | 385 | memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)), |
385 | slot_getbasepfn(node, slot) + slot_psize); | 386 | PFN_PHYS(slot_psize), node); |
386 | } | 387 | } |
387 | } | 388 | } |
388 | } | 389 | } |