The following commit has been merged in the linux branch: commit 8c85dd8730bfb696e691145335f884c7baef8277 Author: Alexey Dobriyan adobriyan@gmail.com Date: Mon Oct 26 16:50:07 2009 -0700

sysctl: fix false positives when PROC_SYSCTL=n

Having ->procname but not ->proc_handler is valid when PROC_SYSCTL=n, people use such combination to reduce ifdefs with non-standard handlers.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14408

Signed-off-by: Alexey Dobriyan adobriyan@gmail.com Reported-by: Peter Teoh htmldeveloper@gmail.com Cc: "Eric W. Biederman" ebiederm@xmission.com Cc: "Rafael J. Wysocki" rjw@sisk.pl Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c index b38423c..b6e7aae 100644 --- a/kernel/sysctl_check.c +++ b/kernel/sysctl_check.c @@ -1521,7 +1521,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table) if (!table->ctl_name && table->strategy) set_fail(&fail, table, "Strategy without ctl_name"); #endif -#ifdef CONFIG_PROC_FS +#ifdef CONFIG_PROC_SYSCTL if (table->procname && !table->proc_handler) set_fail(&fail, table, "No proc_handler"); #endif