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

Commit a2bf79e7 authored by Tejun Heo's avatar Tejun Heo
Browse files

score: Use HAVE_MEMBLOCK_NODE_MAP 



score 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>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
parent ff38df37

arch/score/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ config SCORE 
       def_bool y

       select HAVE_GENERIC_HARDIRQS

       select GENERIC_IRQ_SHOW

       select HAVE_MEMBLOCK

       select HAVE_MEMBLOCK_NODE_MAP

       select ARCH_DISCARD_MEMBLOCK



choice

	prompt "System type"

arch/score/kernel/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/bootmem.h>

#include <linux/initrd.h>

#include <linux/ioport.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/seq_file.h>

#include <linux/screen_info.h>
@@ -54,7 +55,8 @@ static void __init bootmem_init(void) 
	/* Initialize the boot-time allocator with low memory only. */

	bootmap_size = init_bootmem_node(NODE_DATA(0), start_pfn,

					 min_low_pfn, max_low_pfn);

	add_active_range(0, min_low_pfn, max_low_pfn);

	memblock_add_node(PFN_PHYS(min_low_pfn),

			  PFN_PHYS(max_low_pfn - min_low_pfn), 0);



	free_bootmem(PFN_PHYS(start_pfn),

		     (max_low_pfn - start_pfn) << PAGE_SHIFT);