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

Commit 8df995f6 authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Linus Torvalds
Browse files

mm: simplify MEMORY_ISOLATION && COMPACTION || CMA into CONTIG_ALLOC 

This condition allows to define alloc_contig_range, so simplify it into a
more accurate naming.

Link: http://lkml.kernel.org/r/20190327063626.18421-4-alex@ghiti.fr


Signed-off-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Suggested-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andy Lutomirsky <luto@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rich Felker <dalias@libc.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.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 b53f4569

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ config ARM64 
	select ARCH_HAS_FAST_MULTIPLIER

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select ARCH_HAS_KCOV

	select ARCH_HAS_KEEPINITRD

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

arch/powerpc/platforms/Kconfig.cputype

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ config ARCH_ENABLE_SPLIT_PMD_PTLOCK 
config PPC_RADIX_MMU

	bool "Radix MMU Support"

	depends on PPC_BOOK3S_64 && HUGETLB_PAGE

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select PPC_HAVE_KUEP

	select PPC_HAVE_KUAP

	default y

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config S390 
	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC

	select ARCH_HAS_KCOV

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SET_MEMORY

arch/sh/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ config SUPERH 
	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_NMI

	select NEED_SG_DMA_LENGTH

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC



	help

	  The SuperH is a RISC processor targeted for use in embedded systems

arch/sparc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ config SPARC64 
	select ARCH_CLOCKSOURCE_DATA

	select ARCH_HAS_PTE_SPECIAL

	select PCI_DOMAINS if PCI

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_GIGANTIC_PAGE if CONTIG_ALLOC



config ARCH_DEFCONFIG

	string