Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 73ec0394571739722364d11458f3bb3ba403d45c..0a947bd9c0760a8eff4aa79b1a08066af8e75fc4 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -87,10 +87,6 @@ config ARCH_HAS_ILOG2_U64
        bool
        default y if 64BIT
 
-config ARCH_HAS_CPU_IDLE_WAIT
-       bool
-       default y
-
 config GENERIC_HWEIGHT
        bool
        default y
@@ -144,6 +140,7 @@ config PPC
        select HAVE_BPF_JIT if PPC64
        select HAVE_ARCH_JUMP_LABEL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
+       select GENERIC_SMP_IDLE_THREAD
 
 config EARLY_PRINTK
        bool
@@ -353,7 +350,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
 
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP && !PPC_47x)) && EXPERIMENTAL
+       depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
@@ -370,7 +367,7 @@ config KEXEC
 
 config CRASH_DUMP
        bool "Build a kdump crash kernel"
-       depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP && !PPC_47x)
+       depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
        select RELOCATABLE if PPC64 || 44x
        select DYNAMIC_MEMSTART if FSL_BOOKE
        help