diff options
| author | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-29 17:51:46 -0400 |
| commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
| tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/Kconfig | |
| parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
| parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) | |
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 | |||
| 167 | config LSM_MMAP_MIN_ADDR | 167 | config LSM_MMAP_MIN_ADDR |
| 168 | int "Low address space for LSM to protect from user allocation" | 168 | int "Low address space for LSM to protect from user allocation" |
| 169 | depends on SECURITY && SECURITY_SELINUX | 169 | depends on SECURITY && SECURITY_SELINUX |
| 170 | default 32768 if ARM | ||
| 170 | default 65536 | 171 | default 65536 |
| 171 | help | 172 | help |
| 172 | This is the portion of low virtual memory which should be protected | 173 | This is the portion of low virtual memory which should be protected |