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/kernel/setup.c | |
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/kernel/setup.c')
-rw-r--r-- | arch/mips/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 84af26ab221..b1cb8f87d7b 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
15 | #include <linux/export.h> | 15 | #include <linux/export.h> |
16 | #include <linux/screen_info.h> | 16 | #include <linux/screen_info.h> |
17 | #include <linux/memblock.h> | ||
17 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
18 | #include <linux/initrd.h> | 19 | #include <linux/initrd.h> |
19 | #include <linux/root_dev.h> | 20 | #include <linux/root_dev.h> |
@@ -352,7 +353,7 @@ static void __init bootmem_init(void) | |||
352 | continue; | 353 | continue; |
353 | #endif | 354 | #endif |
354 | 355 | ||
355 | add_active_range(0, start, end); | 356 | memblock_add_node(PFN_PHYS(start), PFN_PHYS(end - start), 0); |
356 | } | 357 | } |
357 | 358 | ||
358 | /* | 359 | /* |