commit b4819b593740a6d11db07b52e0fe35975b29a185
author Yoichi Yuasa <yuasa@hh.iij4u.or.jp> Sat Jun 25 14:54:31 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Jun 25 16:24:25 2005 -0700
tree 3e697be3b75988432596131ccde17c33d2318650
parent 7919a693bd735ed0aa93fc359ae09a588cfeb3bc

[PATCH] mips: add MIPS-specific support for flatmem/discontigmem

2.6.12-git6 doesn't boot on some MIPS machines.  They need the support of flat
memory and discontig memory.

Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/mips/mm/init.c

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 73843c5..9c9a271 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -128,7 +128,7 @@
 #endif /* CONFIG_MIPS64 */
 #endif /* CONFIG_HIGHMEM */
 
-#ifndef CONFIG_DISCONTIGMEM
+#ifndef CONFIG_NEED_MULTIPLE_NODES
 extern void pagetable_init(void);
 
 void __init paging_init(void)
@@ -253,7 +253,7 @@
 	       initsize >> 10,
 	       (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
 }
-#endif /* !CONFIG_DISCONTIGMEM */
+#endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)