diff --git a/[refs] b/[refs] index 69ce89237ecc..bd96fd9128ee 100644 --- 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 index f95f12c5840c..c414d90e647b 100644 --- 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 -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 index 45e76f209dcb..4bc8e48434a7 100644 --- 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 index 16ad14b5d572..665e856675a4 100644 --- a/trunk/net/sysctl_net.c +++ b/trunk/net/sysctl_net.c @@ -30,10 +30,6 @@ #include #endif -struct ctl_table net_table[] = { - { 0 }, -}; - static struct list_head * net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces) {