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 | a2bf79e7dcc97b4e9654f273453f9264f49e41ff (patch) | |
| tree | 8510184d6fe5915801690153342cc420b25cfff9 | |
| parent | ff38df377cfd23472fc0de63108781ad2388efbf (diff) | |
| download | op-kernel-dev-a2bf79e7dcc97b4e9654f273453f9264f49e41ff.zip op-kernel-dev-a2bf79e7dcc97b4e9654f273453f9264f49e41ff.tar.gz | |
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>
| -rw-r--r-- | arch/score/Kconfig | 3 | ||||
| -rw-r--r-- | arch/score/kernel/setup.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index df169e8..e5ae12f 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -4,6 +4,9 @@ config SCORE def_bool y select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_SHOW + select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP + select ARCH_DISCARD_MEMBLOCK choice prompt "System type" diff --git a/arch/score/kernel/setup.c b/arch/score/kernel/setup.c index 6f898c0..b48459a 100644 --- a/arch/score/kernel/setup.c +++ b/arch/score/kernel/setup.c @@ -26,6 +26,7 @@ #include <linux/bootmem.h> #include <linux/initrd.h> #include <linux/ioport.h> +#include <linux/memblock.h> #include <linux/mm.h> #include <linux/seq_file.h> #include <linux/screen_info.h> @@ -54,7 +55,8 @@ static void __init bootmem_init(void) /* Initialize the boot-time allocator with low memory only. */ bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn, min_low_pfn, max_low_pfn); - add_active_range(0, min_low_pfn, max_low_pfn); + memblock_add_node(PFN_PHYS(min_low_pfn), + PFN_PHYS(max_low_pfn - min_low_pfn), 0); free_bootmem(PFN_PHYS(start_pfn), (max_low_pfn - start_pfn) << PAGE_SHIFT); |
