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

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

mm: memblock: make keeping memblock memory opt-in rather than opt-out 

Most architectures do not need the memblock memory after the page
allocator is initialized, but only few enable ARCH_DISCARD_MEMBLOCK in the
arch Kconfig.

Replacing ARCH_DISCARD_MEMBLOCK with ARCH_KEEP_MEMBLOCK and inverting the
logic makes it clear which architectures actually use memblock after
system initialization and skips the necessity to add ARCH_DISCARD_MEMBLOCK
to the architectures that are still missing that option.

Link: http://lkml.kernel.org/r/1556102150-32517-1-git-send-email-rppt@linux.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: James Hogan <jhogan@kernel.org>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f27a5136

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ config ARM 
	default y

	select ARCH_32BIT_OFF_T

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_DISCARD_MEMBLOCK if !HAVE_ARCH_PFN_VALID && !KEXEC

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE
@@ -22,6 +21,7 @@ config ARM 
	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_KEEP_MEMBLOCK if HAVE_ARCH_PFN_VALID || KEXEC

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ config ARM64 
	select ARCH_INLINE_SPIN_UNLOCK_BH if !PREEMPT

	select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPT

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPT

	select ARCH_KEEP_MEMBLOCK

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

arch/hexagon/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ config HEXAGON 
	select GENERIC_IRQ_SHOW

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select ARCH_DISCARD_MEMBLOCK

	select NEED_SG_DMA_LENGTH

	select NO_IOPORT_MAP

	select GENERIC_IOMAP

arch/ia64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ config IA64 
	select ARCH_HAS_DMA_COHERENT_TO_PFN if SWIOTLB

	select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB

	select VIRT_TO_BUS

	select ARCH_DISCARD_MEMBLOCK

	select GENERIC_IRQ_PROBE

	select GENERIC_PENDING_IRQ if SMP

	select GENERIC_IRQ_SHOW

arch/m68k/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ config M68K 
	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select ARCH_DISCARD_MEMBLOCK

	select MMU_GATHER_NO_RANGE if MMU



config CPU_BIG_ENDIAN