summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:58:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 16:58:26 -0800
commitefc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa (patch)
treecf7df8a837b719623e13b3ab19e8cfce1e270883 /mm
parentb5c96f89177b460ef89ecd777d5f2fefd4534d3f (diff)
parenta00ae4d21b2fa9379914f270ffffd8d3bec55430 (diff)
downloadlinux-efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support NOMMU: Optimise away the {dac_,}mmap_min_addr tests security/min_addr.c: make init_mmap_min_addr() static keys: PTR_ERR return of wrong pointer in keyctl_get_security()
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 43ea8c3a2bbf..ee9f3e0f2b69 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -221,6 +221,7 @@ config KSM
config DEFAULT_MMAP_MIN_ADDR
int "Low address space to protect from user allocation"
+ depends on MMU
default 4096
help
This is the portion of low virtual memory which should be protected