powerpc: Allow platforms to force-enable CONFIG_SMP

[linux.git] / arch / powerpc / platforms / Kconfig.cputype

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 99b0ae8acb783399b47bbfaf7af1567c5b63d084..ee87cb37c580a4de59a61f217fff790b354b7385 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -359,7 +359,7 @@ config PPC_BOOK3E_MMU
 
 config PPC_MM_SLICES
        bool
-       default y if (!PPC_FSL_BOOK3E && PPC64 && HUGETLB_PAGE) || (PPC_STD_MMU_64 && PPC_64K_PAGES)
+       default y if PPC_STD_MMU_64
        default n
 
 config PPC_HAVE_PMU_SUPPORT
@@ -371,9 +371,16 @@ config PPC_PERF_CTRS
        help
          This enables the powerpc-specific perf_event back-end.
 
+config FORCE_SMP
+       # Allow platforms to force SMP=y by selecting this
+       bool
+       default n
+       select SMP
+
 config SMP
        depends on PPC_BOOK3S || PPC_BOOK3E || FSL_BOOKE || PPC_47x
-       bool "Symmetric multi-processing support"
+       select GENERIC_IRQ_MIGRATION
+       bool "Symmetric multi-processing support" if !FORCE_SMP
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, say N. If you have a system with more