Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / kernel / sysctl_check.c

diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
index 3a01c3e4649473547be45596dd6807351e5adb2c..4e4932a7b3608ac6e32175ee87481c1ac47a3572 100644 (file)
--- a/kernel/sysctl_check.c
+++ b/kernel/sysctl_check.c
@@ -144,10 +144,6 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
 #ifdef CONFIG_PROC_SYSCTL
                        if (!table->proc_handler)
                                set_fail(&fail, table, "No proc_handler");
-#endif
-#if 0
-                       if (!table->procname && table->proc_handler)
-                               set_fail(&fail, table, "proc_handler without procname");
 #endif
                        sysctl_check_leaf(namespaces, table, &fail);
                }