Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5bd868f2e8136cc3f872ff42cc637a815c6d5be1..f7c8f9972f618109209e4892512ed903f6b865f3 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -146,6 +146,7 @@ config PPC
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF         if PPC64
        select ARCH_WANT_IPC_PARSE_VERSION
+       select ARCH_WEAK_RELEASE_ACQUIRE
        select BINFMT_ELF
        select BUILDTIME_EXTABLE_SORT
        select CLONE_BACKWARDS
@@ -164,7 +165,6 @@ config PPC
        select GENERIC_STRNLEN_USER
        select GENERIC_TIME_VSYSCALL_OLD
        select HAVE_ARCH_AUDITSYSCALL
-       select HAVE_ARCH_HARDENED_USERCOPY
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_MMAP_RND_BITS
@@ -588,21 +588,23 @@ config RELOCATABLE_TEST
          relocation code.
 
 config CRASH_DUMP
-       bool "Build a kdump crash kernel"
+       bool "Build a dump capture kernel"
        depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
        select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
        help
-         Build a kernel suitable for use as a kdump capture kernel.
+         Build a kernel suitable for use as a dump capture kernel.
          The same kernel binary can be used as production kernel and dump
          capture kernel.
 
 config FA_DUMP
        bool "Firmware-assisted dump"
-       depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC_CORE
+       depends on PPC64 && PPC_RTAS
+       select CRASH_CORE
+       select CRASH_DUMP
        help
          A robust mechanism to get reliable kernel crash dump with
          assistance from firmware. This approach does not use kexec,
-         instead firmware assists in booting the kdump kernel
+         instead firmware assists in booting the capture kernel
          while preserving memory contents. Firmware-assisted dump
          is meant to be a kdump replacement offering robustness and
          speed not possible without system firmware assistance.