Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[linux-2.6-block.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1c971be1b985e97b78e598b3c6be8a51cc65e571..2198837c256fd63b33d33817fba12e762c88abfa 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -23,7 +23,7 @@ config MIPS
        select HAVE_KRETPROBES
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_SYSCALL_TRACEPOINTS
-       select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+       select ARCH_HAS_ELF_RANDOMIZE
        select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
        select RTC_LIB if !MACH_LOONGSON
        select GENERIC_ATOMIC64 if !64BIT
@@ -2680,6 +2680,11 @@ config STACKTRACE_SUPPORT
        bool
        default y
 
+config PGTABLE_LEVELS
+       int
+       default 3 if 64BIT && !PAGE_SIZE_64KB
+       default 2
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"