diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:58:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:58:26 -0800 |
| commit | efc8e7f4c83dc85acbf5f54a8b1b24ae75b20aaa (patch) | |
| tree | cf7df8a837b719623e13b3ab19e8cfce1e270883 /kernel | |
| parent | b5c96f89177b460ef89ecd777d5f2fefd4534d3f (diff) | |
| parent | a00ae4d21b2fa9379914f270ffffd8d3bec55430 (diff) | |
| download | linux-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 'kernel')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6665761c006d..8a68b2448468 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1214,6 +1214,7 @@ static struct ctl_table vm_table[] = { .proc_handler = proc_dointvec_jiffies, }, #endif +#ifdef CONFIG_MMU { .procname = "mmap_min_addr", .data = &dac_mmap_min_addr, @@ -1221,6 +1222,7 @@ static struct ctl_table vm_table[] = { .mode = 0644, .proc_handler = mmap_min_addr_handler, }, +#endif #ifdef CONFIG_NUMA { .procname = "numa_zonelist_order", |