diff --git a/[refs] b/[refs] index 29c7cd531224..1b5affe1f745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 115a57c5b31ab560574fe1a09deaba2ae89e77b5 +refs/heads/master: 8c85dd8730bfb696e691145335f884c7baef8277 diff --git a/trunk/kernel/sysctl_check.c b/trunk/kernel/sysctl_check.c index b38423ca711a..b6e7aaea4604 100644 --- a/trunk/kernel/sysctl_check.c +++ b/trunk/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