diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-14 20:33:33 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 20:33:33 -0800 |
| commit | 3169cab06bf18e3b6f5bd68dd253502aba0eb9c4 (patch) | |
| tree | 83a5ef854b7bde3f1b440b81f226aacdacdfebb4 /arch/arm/Kconfig | |
| parent | 387c9643f0e352b47267983730f0f8ea866ca9a3 (diff) | |
| parent | 3daddaa28cbf7330e6b0fd38241b28458a89a52f (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.12-android
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 424f1576b651..3a350d35901c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -297,10 +297,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 @@ -308,6 +310,7 @@ config ARCH_MMAP_RND_BITS_MAX 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 |