mm: split ET_DYN ASLR from mmap ASLR

[firefly-linux-kernel-4.4.55.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c7a16904cd03c705333f645419ec07888fc6fd87..a326c4cb8cf0e65f8e75eb4fb2c9e0b124f1d52e 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
@@ -2600,6 +2600,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"