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>

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index dd84be9ac6e4b589bffefefd6846d62e178e0db3..b8bd058c5cd24b99cdbe899528e6794b81ce504a 100644 (file)
--- 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",