OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Tejun Heo 2011-12-08 10:22:09 -08:00
parent 98e4ae8af0
commit 9d15ffc824
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/mips/Kconfig
View File

@ -25,6 +25,9 @@ config MIPS
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_JUMP_LABEL
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
select ARCH_DISCARD_MEMBLOCK
menu "Machine selection" menu "Machine selection"

3
arch/mips/kernel/setup.c
View File

@ -14,6 +14,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/screen_info.h> #include <linux/screen_info.h>
#include <linux/memblock.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/initrd.h> #include <linux/initrd.h>
#include <linux/root_dev.h> #include <linux/root_dev.h>
@ -352,7 +353,7 @@ static void __init bootmem_init(void)
continue; continue;
#endif #endif
add_active_range(0, start, end); memblock_add_node(PFN_PHYS(start), PFN_PHYS(end - start), 0);
} }
/* /*

5
arch/mips/sgi-ip27/ip27-memory.c
View File

@ -12,6 +12,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/memblock.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <linux/module.h> #include <linux/module.h>
@ -381,8 +382,8 @@ static void __init szmem(void)
continue; continue;
} }
num_physpages += slot_psize; num_physpages += slot_psize;
add_active_range(node, slot_getbasepfn(node, slot), memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)),
slot_getbasepfn(node, slot) + slot_psize); PFN_PHYS(slot_psize), node);
} }
} }
} }