Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5084bdc..9b780e0 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -88,7 +88,7 @@ config PPC
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select BINFMT_ELF
-       select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+       select ARCH_HAS_ELF_RANDOMIZE
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM
@@ -297,6 +297,12 @@ config ZONE_DMA32
        bool
        default y if PPC64
 
+config PGTABLE_LEVELS
+       int
+       default 2 if !PPC64
+       default 3 if PPC_64K_PAGES
+       default 4
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"