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

Commit 0ee332c1 authored by Tejun Heo's avatar Tejun Heo
Browse files

memblock: Kill early_node_map[] 



Now all ARCH_POPULATES_NODE_MAP archs select HAVE_MEBLOCK_NODE_MAP -
there's no user of early_node_map[] left.  Kill early_node_map[] and
replace ARCH_POPULATES_NODE_MAP with HAVE_MEMBLOCK_NODE_MAP.  Also,
relocate for_each_mem_pfn_range() and helper from mm.h to memblock.h
as page_alloc.c would no longer host an alternative implementation.

This change is ultimately one to one mapping and shouldn't cause any
observable difference; however, after the recent changes, there are
some functions which now would fit memblock.c better than page_alloc.c
and dependency on HAVE_MEMBLOCK_NODE_MAP instead of HAVE_MEMBLOCK
doesn't make much sense on some of them.  Further cleanups for
functions inside HAVE_MEMBLOCK_NODE_MAP in mm.h would be nice.

-v2: Fix compile bug introduced by mis-spelling
 CONFIG_HAVE_MEMBLOCK_NODE_MAP to CONFIG_MEMBLOCK_HAVE_NODE_MAP in
 mmzone.h.  Reported by Stephen Rothwell.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
parent a2bf79e7

arch/ia64/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -477,9 +477,6 @@ config NODES_SHIFT 
	  MAX_NUMNODES will be 2^(This value).

	  If in doubt, use the default.



config ARCH_POPULATES_NODE_MAP

	def_bool y



# VIRTUAL_MEM_MAP and FLAT_NODE_MEM_MAP are functionally equivalent.

# VIRTUAL_MEM_MAP has been retained for historical reasons.

config VIRTUAL_MEM_MAP

arch/mips/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -2067,9 +2067,6 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa> for more.



config ARCH_POPULATES_NODE_MAP

	def_bool y



config ARCH_SPARSEMEM_ENABLE

	bool

	select SPARSEMEM_STATIC

arch/powerpc/Kconfig

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

	depends on (SMP && PPC_PSERIES) || PPC_PS3



config ARCH_POPULATES_NODE_MAP

	def_bool y



config SYS_SUPPORTS_HUGETLBFS

	bool

arch/s390/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -348,9 +348,6 @@ config WARN_DYNAMIC_STACK 


	  Say N if you are unsure.



config ARCH_POPULATES_NODE_MAP

	def_bool y



comment "Kernel preemption"



source "kernel/Kconfig.preempt"

arch/score/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ config 32BIT 
config ARCH_FLATMEM_ENABLE

	def_bool y



config ARCH_POPULATES_NODE_MAP

	def_bool y



source "mm/Kconfig"



config MEMORY_START