Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d15ffc8 authored by Tejun Heo's avatar Tejun Heo
Browse files

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: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-mips@linux-mips.org
parent 98e4ae8a

arch/mips/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ config MIPS 
	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_JUMP_LABEL

	select IRQ_FORCED_THREADING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select ARCH_DISCARD_MEMBLOCK



menu "Machine selection"

arch/mips/kernel/setup.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/ioport.h>

#include <linux/export.h>

#include <linux/screen_info.h>

#include <linux/memblock.h>

#include <linux/bootmem.h>

#include <linux/initrd.h>

#include <linux/root_dev.h>
@@ -352,7 +353,7 @@ static void __init bootmem_init(void) 
			continue;

#endif



		add_active_range(0, start, end);

		memblock_add_node(PFN_PHYS(start), PFN_PHYS(end - start), 0);

	}



	/*

arch/mips/sgi-ip27/ip27-memory.c

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/mmzone.h>

#include <linux/module.h>
@@ -381,8 +382,8 @@ static void __init szmem(void) 
				continue;

			}

			num_physpages += slot_psize;

			add_active_range(node, slot_getbasepfn(node, slot),

					 slot_getbasepfn(node, slot) + slot_psize);

			memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)),

					  PFN_PHYS(slot_psize), node);

		}

	}

}