diff options
| author |   Alex Elder <elder@ieee.org> | 2009-09-10 14:33:56 -0500 |
|---|---|---|
| committer |   Alex Elder <aelder@sgi.com> | 2009-09-10 14:33:56 -0500 |
| commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
| tree | f79577c2731753efb621ef62774949c1e0acdaad /kernel/sysctl.c | |
| parent | xfs: use correct log reservation when handling ENOSPC in xfs_create (diff) | |
| parent | Linux 2.6.31 (diff) | |
| download | linux-dev-a4872d5b6ad69a49975c0268828b5bb2317ea5a0.tar.xz linux-dev-a4872d5b6ad69a49975c0268828b5bb2317ea5a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 98e02328c67d..58be76017fd0 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -49,6 +49,7 @@ #include <linux/acpi.h> #include <linux/reboot.h> #include <linux/ftrace.h> +#include <linux/security.h> #include <linux/slow-work.h> #include <linux/perf_counter.h> @@ -1306,10 +1307,10 @@ static struct ctl_table vm_table[] = { { .ctl_name = CTL_UNNUMBERED, .procname = "mmap_min_addr", - .data = &mmap_min_addr, - .maxlen = sizeof(unsigned long), + .data = &dac_mmap_min_addr, + .maxlen = sizeof(unsigned long), .mode = 0644, - .proc_handler = &proc_doulongvec_minmax, + .proc_handler = &mmap_min_addr_handler, }, #ifdef CONFIG_NUMA { |