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

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

s390: Use HAVE_MEMBLOCK_NODE_MAP 



s390 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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-s390@vger.kernel.org
parent 9d15ffc8

arch/s390/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ config S390 
	select HAVE_ARCH_JUMP_LABEL if !MARCH_G5

	select HAVE_RCU_TABLE_FREE if SMP

	select ARCH_SAVE_PAGE_KEYS if HIBERNATION

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select ARCH_DISCARD_MEMBLOCK

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

arch/s390/kernel/setup.c

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

#include <linux/sched.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

#include <linux/mm.h>

#include <linux/stddef.h>

#include <linux/unistd.h>
@@ -820,7 +821,8 @@ setup_memory(void) 
		end_chunk = min(end_chunk, end_pfn);

		if (start_chunk >= end_chunk)

			continue;

		add_active_range(0, start_chunk, end_chunk);

		memblock_add_node(PFN_PHYS(start_chunk),

				  PFN_PHYS(end_chunk - start_chunk), 0);

		pfn = max(start_chunk, start_pfn);

		for (; pfn < end_chunk; pfn++)

			page_set_storage_key(PFN_PHYS(pfn),