summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-01-08 00:40:42 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-18 10:19:49 -0800
commit71c77079a7b5c22e01eba239f93ce38bd6126725 (patch)
treeeb6bb0f65cb7bb2139d0130e90376b5e9a6f7c96 /kernel/sysctl.c
parent904e3733fd1c50e81f4726f56759343207874a95 (diff)
kernel/sysctl.c: fix stable merge error in NOMMU mmap_min_addr
Stable commit 0399123f3dcce1a515d021107ec0fb4413ca3efa didn't match the original upstream commit. The CONFIG_MMU check was added much too early in the list disabling a lot of proc entries in the process. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index dd84be9ac6e4..b8bd058c5cd2 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1200,7 +1200,6 @@ static struct ctl_table vm_table[] = {
.extra2 = (void *)&hugetlb_infinity,
},
#endif
-#ifdef CONFIG_MMU
{
.ctl_name = VM_LOWMEM_RESERVE_RATIO,
.procname = "lowmem_reserve_ratio",
@@ -1346,6 +1345,7 @@ static struct ctl_table vm_table[] = {
.strategy = &sysctl_jiffies,
},
#endif
+#ifdef CONFIG_MMU
{
.ctl_name = CTL_UNNUMBERED,
.procname = "mmap_min_addr",