Skip to contentSkip to conversation

fix the SYSCTL=n compilation

PATCH New Adrian Bunk 1 participant 1 message Feb 20, 2007 Proc sysctl

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix the SYSCTL=n compilation

This patch fixes the following compile error with CONFIG_SYSCTL=n:

<-- snip -->

...
CC kernel/sysctl.o
/home/bunk/linux/kernel-2.6/linux-2.6.20-mm2/kernel/sysctl.c:1411: error: conflicting types for 'register_sysctl_table' /home/bunk/linux/kernel-2.6/linux-2.6.20-mm2/include/linux/sysctl.h:1042: error: previous declaration of 'register_sysctl_table' was here make[2]: *** [kernel/sysctl.o] Error 1

<-- snip -->

Caused by commit 0b4d414714f0d2f922d39424b0c5c82ad900a381.

---

kernel/sysctl.c renamed from kernel/sysctl.c.old +1 -2
@@ -1406,8 +1406,7 @@
 }
 
 #else /* !CONFIG_SYSCTL */
-struct ctl_table_header * register_sysctl_table(ctl_table * table,
-						int insert_at_head)
+struct ctl_table_header *register_sysctl_table(ctl_table * table)
 {
 	return NULL;
 }