diff options
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3a350d35901c..e9464e91455b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -30,6 +30,7 @@ config ARM select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL select HAVE_ARCH_KGDB + select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) select HAVE_ARCH_TRACEHOOK select HAVE_BPF_JIT @@ -297,31 +298,12 @@ config MMU support by paged memory management. If unsure, say 'Y'. config ARCH_MMAP_RND_BITS_MIN - depends on MMU - int default 8 config ARCH_MMAP_RND_BITS_MAX - depends on MMU - int - default 14 if MMU && PAGE_OFFSET=0x40000000 - default 15 if MMU && PAGE_OFFSET=0x80000000 - default 16 if MMU - default 8 - -config ARCH_MMAP_RND_BITS - depends on MMU - int "Number of bits to use for ASLR of mmap base address" if EXPERT - range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX - default ARCH_MMAP_RND_BITS_MIN - help - This value can be used to select the number of bits to use to - determine the random offset to the base address of vma regions - resulting from mmap allocations. This value will be bounded - by the architecture's minimum and maximum supported values. - - This value can be changed after boot using the - /proc/sys/kernel/mmap_rnd_bits tunable + default 14 if PAGE_OFFSET=0x40000000 + default 15 if PAGE_OFFSET=0x80000000 + default 16 # # The "ARM system type" choice list is ordered alphabetically by option |