---

yaml --- r: 78333 b: refs/heads/master c: 0891368 h: refs/heads/master i: 78331: 04f9698 v: v3
git-mirror · Jan 28, 2008 · 500eb08 · 500eb08
1 parent 3a987fb
commit 500eb08
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f0bebd9865dc7e327777fca34b75e65cbfd1a6
+refs/heads/master: 08913681e484f3f0db949dd0809012e089846216
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
@@ -337,7 +337,6 @@ static const struct proto_ops name##_ops = {			\
 
 #ifdef CONFIG_SYSCTL
 #include <linux/sysctl.h>
-extern ctl_table net_table[];
 extern int net_msg_cost;
 extern int net_msg_burst;
 #endif

diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
@@ -200,14 +200,6 @@ static struct ctl_table root_table[] = {
 		.mode		= 0555,
 		.child		= vm_table,
 	},
-#ifdef CONFIG_NET
-	{
-		.ctl_name	= CTL_NET,
-		.procname	= "net",
-		.mode		= 0555,
-		.child		= net_table,
-	},
-#endif
 	{
 		.ctl_name	= CTL_FS,
 		.procname	= "fs",

diff --git a/trunk/net/sysctl_net.c b/trunk/net/sysctl_net.c
@@ -30,10 +30,6 @@
 #include <linux/if_tr.h>
 #endif
 
-struct ctl_table net_table[] = {
-	{ 0 },
-};
-
 static struct list_head *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {