Commit aca52c39 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

mm: remove CONFIG_HAVE_MEMBLOCK 

All architecures use memblock for early memory management. There is no need
for the CONFIG_HAVE_MEMBLOCK configuration option.

[rppt@linux.vnet.ibm.com: of/fdt: fixup #ifdefs]
  Link: http://lkml.kernel.org/r/20180919103457.GA20545@rapoport-lnx
[rppt@linux.vnet.ibm.com: csky: fixups after bootmem removal]
  Link: http://lkml.kernel.org/r/20180926112744.GC4628@rapoport-lnx
[rppt@linux.vnet.ibm.com: remove stale #else and the code it protects]
  Link: http://lkml.kernel.org/r/1538067825-24835-1-git-send-email-rppt@linux.vnet.ibm.com
Link: http://lkml.kernel.org/r/1536927045-23536-4-git-send-email-rppt@linux.vnet.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Tested-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4a991ec

arch/alpha/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ config ALPHA 
	select ODD_RT_SIGACTION

	select OLD_SIGSUSPEND

	select CPU_NO_EFFICIENT_FFS if !ALPHA_EV67

	select HAVE_MEMBLOCK

	help

	  The Alpha is a 64-bit general-purpose processor designed and

	  marketed by the Digital Equipment Corporation of blessed memory,

arch/arc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ config ARC 
	select HAVE_KERNEL_LZMA

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ config ARM 
	select HAVE_KERNEL_XZ

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ config ARM64 
	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP if NUMA

	select HAVE_NMI

	select HAVE_PATA_PLATFORM

arch/c6x/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ config C6X 
	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_TRACEHOOK

	select HAVE_MEMBLOCK

	select SPARSE_IRQ

	select IRQ_DOMAIN

	select OF