On Wed, Aug 03, 2011 at 05:17:45PM +0100, Ralf Baechle wrote: > On Tue, Jul 26, 2011 at 05:35:30PM +0200, Tejun Heo wrote: > > > 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@xxxxxxxxxx> > > Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> > > Cc: Yinghai Lu <yinghai@xxxxxxxxxx> > > Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> > > Cc: linux-mips@xxxxxxxxxxxxxx > > --- > > Only compile tested. Thanks. > > > > arch/mips/Kconfig | 3 +++ > > arch/mips/kernel/setup.c | 3 ++- > > arch/mips/sgi-ip27/ip27-memory.c | 5 +++-- > > 3 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > > index 653da62..368b2ec 100644 > > --- a/arch/mips/Kconfig > > +++ b/arch/mips/Kconfig > > @@ -24,6 +24,9 @@ config MIPS > > select GENERIC_IRQ_PROBE > > select GENERIC_IRQ_SHOW > > select HAVE_ARCH_JUMP_LABEL > > + select HAVE_MEMBLOCK > > This means <linux/memblock.h> will include <asm/memblock.h> which does > not exist for MIPS. Did you accidentally not post this new file? Nope, earlier commit 24aa07882b and its fix patch (patch 0.5 in this series) removes asm/memblock.h from all archs and drops it from linux/memblock.h. Thanks. -- tejun