diff options
| author | Tejun Heo <tj@kernel.org> | 2011-12-08 10:22:09 -0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-12-08 10:22:09 -0800 |
| commit | 9d15ffc824a90842b16592f3a960836841bd6c58 (patch) | |
| tree | 92509b0477ef7c72a823f3a17dd5635d9c1ff0e5 /arch/mips/sgi-ip27 | |
| parent | 98e4ae8af0055816747d1e8ad727f69bbfd9f7d0 (diff) | |
| download | lwn-9d15ffc824a90842b16592f3a960836841bd6c58.tar.gz lwn-9d15ffc824a90842b16592f3a960836841bd6c58.zip | |
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 @@ */ #include <linux/init.h> #include <linux/kernel.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <linux/mmzone.h> #include <linux/module.h> @@ -381,8 +382,8 @@ static void __init szmem(void) continue; } num_physpages += slot_psize; - add_active_range(node, slot_getbasepfn(node, slot), - slot_getbasepfn(node, slot) + slot_psize); + memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)), + PFN_PHYS(slot_psize), node); } } } |