diff options
| author | Tejun Heo <tj@kernel.org> | 2011-12-08 10:22:08 -0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-12-08 10:22:08 -0800 |
| commit | 534cfbee295222e188c391db5187ca9a6ab0c035 (patch) | |
| tree | 234d66230714d5916bb55cedb73a8dd4e71c9353 /arch/sh | |
| parent | 2a4814df545a0645aff6fc04e5106877cc576945 (diff) | |
| download | op-kernel-dev-534cfbee295222e188c391db5187ca9a6ab0c035.zip op-kernel-dev-534cfbee295222e188c391db5187ca9a6ab0c035.tar.gz | |
SuperH: Use HAVE_MEMBLOCK_NODE_MAP
sh doesn't access early_node_map[] directly and enabling
HAVE_MEMBLOCK_NODE_MAP is trivial - replacing add_active_range() calls
with memblock_set_node() and selecting HAVE_MEMBLOCK_NODE_MAP is
enough.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/setup.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5629e20..47a2f1c 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -4,6 +4,7 @@ config SUPERH select CLKDEV_LOOKUP select HAVE_IDE if HAS_IOPORT select HAVE_MEMBLOCK + select HAVE_MEMBLOCK_NODE_MAP select HAVE_OPROFILE select HAVE_GENERIC_DMA_COHERENT select HAVE_ARCH_TRACEHOOK diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 1a0e946..7b57bf1 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -230,7 +230,8 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, pmb_bolt_mapping((unsigned long)__va(start), start, end - start, PAGE_KERNEL); - add_active_range(nid, start_pfn, end_pfn); + memblock_set_node(PFN_PHYS(start_pfn), + PFN_PHYS(end_pfn - start_pfn), nid); } void __init __weak plat_early_device_setup(void) |
