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 | a2bf79e7dcc97b4e9654f273453f9264f49e41ff (patch) | |
tree | 8510184d6fe5915801690153342cc420b25cfff9 /arch/score/kernel | |
parent | ff38df377cfd23472fc0de63108781ad2388efbf (diff) |
score: Use HAVE_MEMBLOCK_NODE_MAP
score 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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Diffstat (limited to 'arch/score/kernel')
-rw-r--r-- | arch/score/kernel/setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/score/kernel/setup.c b/arch/score/kernel/setup.c index 6f898c057878..b48459afefdd 100644 --- a/arch/score/kernel/setup.c +++ b/arch/score/kernel/setup.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
27 | #include <linux/initrd.h> | 27 | #include <linux/initrd.h> |
28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
29 | #include <linux/memblock.h> | ||
29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
30 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
31 | #include <linux/screen_info.h> | 32 | #include <linux/screen_info.h> |
@@ -54,7 +55,8 @@ static void __init bootmem_init(void) | |||
54 | /* Initialize the boot-time allocator with low memory only. */ | 55 | /* Initialize the boot-time allocator with low memory only. */ |
55 | bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn, | 56 | bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn, |
56 | min_low_pfn, max_low_pfn); | 57 | min_low_pfn, max_low_pfn); |
57 | add_active_range(0, min_low_pfn, max_low_pfn); | 58 | memblock_add_node(PFN_PHYS(min_low_pfn), |
59 | PFN_PHYS(max_low_pfn - min_low_pfn), 0); | ||
58 | 60 | ||
59 | free_bootmem(PFN_PHYS(start_pfn), | 61 | free_bootmem(PFN_PHYS(start_pfn), |
60 | (max_low_pfn - start_pfn) << PAGE_SHIFT); | 62 | (max_low_pfn - start_pfn) << PAGE_SHIFT); |