Merge tag 'powerpc-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[tomoyo/tomoyo-test1.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8eb6c5e..0b1172c 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -210,7 +210,7 @@ config PPC
        select HAVE_ARCH_KASAN                  if PPC_RADIX_MMU
        select HAVE_ARCH_KASAN                  if PPC_BOOK3E_64
        select HAVE_ARCH_KASAN_VMALLOC          if HAVE_ARCH_KASAN
-       select HAVE_ARCH_KCSAN                  if PPC_BOOK3S_64
+       select HAVE_ARCH_KCSAN
        select HAVE_ARCH_KFENCE                 if ARCH_SUPPORTS_DEBUG_PAGEALLOC
        select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET
        select HAVE_ARCH_WITHIN_STACK_FRAMES
@@ -235,7 +235,7 @@ config PPC
        select HAVE_FUNCTION_DESCRIPTORS        if PPC64_ELF_ABI_V1
        select HAVE_FUNCTION_ERROR_INJECTION
        select HAVE_FUNCTION_GRAPH_TRACER
-       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_TRACER             if PPC64 || (PPC32 && CC_IS_GCC)
        select HAVE_GCC_PLUGINS                 if GCC_VERSION >= 50200   # plugin support on gcc <= 5.1 is buggy on PPC
        select HAVE_GENERIC_VDSO
        select HAVE_HARDLOCKUP_DETECTOR_ARCH    if PPC_BOOK3S_64 && SMP
@@ -277,6 +277,7 @@ config PPC
        select IRQ_DOMAIN
        select IRQ_FORCED_THREADING
        select KASAN_VMALLOC                    if KASAN && MODULES
+       select LOCK_MM_AND_FIND_VMA
        select MMU_GATHER_PAGE_SIZE
        select MMU_GATHER_RCU_TABLE_FREE
        select MMU_GATHER_MERGE_VMAS
@@ -546,8 +547,9 @@ config LD_HEAD_STUB_CATCH
          If unsure, say "N".
 
 config MPROFILE_KERNEL
-       depends on PPC64 && CPU_LITTLE_ENDIAN && FUNCTION_TRACER
-       def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-mprofile-kernel.sh $(CC) -I$(srctree)/include -D__KERNEL__)
+       depends on PPC64_ELF_ABI_V2 && FUNCTION_TRACER
+       def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-mprofile-kernel.sh $(CC) -mlittle-endian) if CPU_LITTLE_ENDIAN
+       def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-mprofile-kernel.sh $(CC) -mbig-endian) if CPU_BIG_ENDIAN
 
 config HOTPLUG_CPU
        bool "Support for enabling/disabling CPUs"
@@ -623,10 +625,12 @@ config ARCH_HAS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
 
 config PPC64_BIG_ENDIAN_ELF_ABI_V2
-       bool "Build big-endian kernel using ELF ABI V2 (EXPERIMENTAL)"
+       # Option is available to BFD, but LLD does not support ELFv1 so this is
+       # always true there.
+       prompt "Build big-endian kernel using ELF ABI V2" if LD_IS_BFD && EXPERT
+       def_bool y
        depends on PPC64 && CPU_BIG_ENDIAN
        depends on CC_HAS_ELFV2
-       depends on LD_VERSION >= 22400 || LLD_VERSION >= 150000
        help
          This builds the kernel image using the "Power Architecture 64-Bit ELF
          V2 ABI Specification", which has a reduced stack overhead and faster
@@ -637,8 +641,6 @@ config PPC64_BIG_ENDIAN_ELF_ABI_V2
          it is less well tested by kernel and toolchain. However some distros
          build userspace this way, and it can produce a functioning kernel.
 
-         This requires GCC and binutils 2.24 or newer.
-
 config RELOCATABLE
        bool "Build a relocatable kernel"
        depends on PPC64 || (FLATMEM && (44x || PPC_85xx))