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

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

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 7264e91190be928e125d01fe22be89a2b544c597..c140e94c7c72b466483fbf05be8eb82e084d346b 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -405,6 +405,16 @@ config PPC_DOORBELL
 
 endmenu
 
+config VDSO32
+       def_bool y
+       depends on PPC32 || CPU_BIG_ENDIAN
+       help
+         This symbol controls whether we build the 32-bit VDSO. We obviously
+         want to do that if we're building a 32-bit kernel. If we're building
+         a 64-bit kernel then we only want a 32-bit VDSO if we're building for
+         big endian. That is because the only little endian configuration we
+         support is ppc64le which is 64-bit only.
+
 choice
        prompt "Endianness selection"
        default CPU_BIG_ENDIAN
@@ -421,6 +431,7 @@ config CPU_BIG_ENDIAN
 
 config CPU_LITTLE_ENDIAN
        bool "Build little endian kernel"
+       depends on PPC_BOOK3S_64
        select PPC64_BOOT_WRAPPER
        help
          Build a little endian kernel.