diff --git a/[refs] b/[refs]
index 59a69a0cea9c..d5e1c9b093ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a1a3b9f686bb04820a232cc1657ef2c45670709
+refs/heads/master: 1a2ee93d281d00cc6e2db1c306032a105d2c9474
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index d5bf8b28bbf4..a044e2d9a8f0 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -25,7 +25,7 @@ EXPORT_SYMBOL_GPL(init_net);
 /*
  * setup_net runs the initializers for the network namespace object.
  */
-static int setup_net(struct net *net)
+static __net_init int setup_net(struct net *net)
 {
 	/* Must be called with net_mutex held */
 	struct pernet_operations *ops;