From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757204Ab0ANWar (ORCPT ); Thu, 14 Jan 2010 17:30:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757154Ab0ANWag (ORCPT ); Thu, 14 Jan 2010 17:30:36 -0500 Received: from kroah.org ([198.145.64.141]:60715 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932274Ab0ANW3A (ORCPT ); Thu, 14 Jan 2010 17:29:00 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@kernel.org, stable-review@kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, Mike Frysinger , Greg Kroah-Hartman Subject: [PATCH 46/52] kernel/sysctl.c: fix stable merge error in NOMMU mmap_min_addr Date: Thu, 14 Jan 2010 14:27:25 -0800 Message-Id: <1263508051-7868-46-git-send-email-gregkh@suse.de> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1263508051-7868-45-git-send-email-gregkh@suse.de> References: <20100114222551.GA7839@suse.de> <1263508051-7868-1-git-send-email-gregkh@suse.de> <1263508051-7868-2-git-send-email-gregkh@suse.de> <1263508051-7868-3-git-send-email-gregkh@suse.de> <1263508051-7868-4-git-send-email-gregkh@suse.de> <1263508051-7868-5-git-send-email-gregkh@suse.de> <1263508051-7868-6-git-send-email-gregkh@suse.de> <1263508051-7868-7-git-send-email-gregkh@suse.de> <1263508051-7868-8-git-send-email-gregkh@suse.de> <1263508051-7868-9-git-send-email-gregkh@suse.de> <1263508051-7868-10-git-send-email-gregkh@suse.de> <1263508051-7868-11-git-send-email-gregkh@suse.de> <1263508051-7868-12-git-send-email-gregkh@suse.de> <1263508051-7868-13-git-send-email-gregkh@suse.de> <1263508051-7868-14-git-send-email-gregkh@suse.de> <1263508051-7868-15-git-send-email-gregkh@suse.de> <1263508051-7868-16-git-send-email-gregkh@suse.de> <1263508051-7868-17-git-send-email-gregkh@suse.de> <1263508051-7868-18-git-send-email-gregkh@suse.de> <1263508051-7868-19-git-send-email-gregkh@suse.de> <1263508051-7868-20-git-send-email-gregkh@suse.de> <1263508051-7868-21-git-send-email-gregkh@suse.de> <1263508051-7868-22-git-send-email-gregkh@suse.de> <1263508051-7868-23-git-send-email-gregkh@suse.de> <1263508051-7868-24-git-send-email-gregkh@suse.de> <1263508051-7868-25-git-send-email-gregkh@suse.de> <1263508051-7868-26-git-send-email-gregkh@suse.de> <1263508051-7868-27-git-send-email-gregkh@suse.de> <1263508051-7868-28-git-send-email-gregkh@suse.de> <1263508051-7868-29-git-send-email-gregkh@suse.de> <1263508051-7868-30-git-send-email-gregkh@suse.de> <1263508051-7868-31-git-send-email-gregkh@suse.de> <1263508051-7868-32-git-send-email-gregkh@suse.de> <1263508051-7868-33-git-send-email-gregkh@suse.de> <1263508051-7868-34-git-send-email-gregkh@suse.de> <1263508051-7868-35-git-send-email-gregkh@suse.de> <1263508051-7868-36-git-send-email-gregkh@suse.de> <1263508051-7868-37-git-send-email-gregkh@suse.de> <1263508051-7868-38-git-send-email-gregkh@suse.de> <1263508051-7868-39-git-send-email-gregkh@suse.de> <1263508051-7868-40-git-send-email-gregkh@suse.de> <1263508051-7868-41-git-send-email-gregkh@suse.de> <1263508051-7868-42-git-send-email-gregkh@suse.de> <1263508051-7868-43-git-send-email-gregkh@suse.de> <1263508051-7868-44-git-send-email-gregkh@suse.de> <1263508051-7868-45-git-send-email-gregkh@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Frysinger 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 Signed-off-by: Greg Kroah-Hartman --- kernel/sysctl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index dd84be9..b8bd058 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", -- 1.6.6