Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs

[deliverable/linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 875d815a8e7ffa966843ba93d9111a9b1458f833..2f898d63eb96ad4fb5b0cf0528aa69dfb54633cc 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -138,6 +138,7 @@ config PPC
        select OLD_SIGSUSPEND
        select OLD_SIGACTION if PPC32
        select HAVE_DEBUG_STACKOVERFLOW
+       select HAVE_IRQ_EXIT_ON_IRQ_STACK
 
 config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN
@@ -407,7 +408,7 @@ config CRASH_DUMP
 
 config FA_DUMP
        bool "Firmware-assisted dump"
-       depends on PPC64 && PPC_RTAS && CRASH_DUMP
+       depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC
        help
          A robust mechanism to get reliable kernel crash dump with
          assistance from firmware. This approach does not use kexec,
@@ -420,7 +421,7 @@ config FA_DUMP
 
 config IRQ_ALL_CPUS
        bool "Distribute interrupts on all CPUs by default"
-       depends on SMP && !MV64360
+       depends on SMP
        help
          This option gives the kernel permission to distribute IRQs across
          multiple CPUs.  Saying N here will route all IRQs to the first