net: Move all of the network sysctls without a namespace into init_net.

[linux-2.6-block.git] / net / core / sysctl_net_core.c

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 0c2850874254edb2159380481c838ff3c2f8dd4f..7d3772e0d150511070d89f81a7097e37d1c697b7 100644 (file)
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -14,6 +14,7 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 
 #include <net/ip.h>
 #include <net/sock.h>
@@ -256,8 +257,8 @@ static __init int sysctl_core_init(void)
 {
        static struct ctl_table empty[1];
 
-       register_sysctl_paths(net_core_path, empty);
-       register_net_sysctl_rotable(net_core_path, net_core_table);
+       kmemleak_not_leak(register_net_sysctl_table(&init_net, net_core_path, empty));
+       register_net_sysctl(&init_net, "net/core", net_core_table);
        return register_pernet_subsys(&sysctl_core_ops);
 }