diff options
| author | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 23:51:46 +0200 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/Kconfig | |
| parent | Merge branch 'master'; commit 'v2.6.39-rc1' into next (diff) | |
| parent | security: select correct default LSM_MMAP_MIN_ADDR on ARM. (diff) | |
| download | linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.xz linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip | |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/Kconfig')
| -rw-r--r-- | security/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig index 95accd442d55..e0f08b52e4ab 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -167,6 +167,7 @@ config INTEL_TXT config LSM_MMAP_MIN_ADDR int "Low address space for LSM to protect from user allocation" depends on SECURITY && SECURITY_SELINUX + default 32768 if ARM default 65536 help This is the portion of low virtual memory which should be protected |