Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 0 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index f8abfa349ef9..513bc3e489f0 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -9,6 +9,7 @@
 #include <linux/ipc.h>
 #include <linux/pid_namespace.h>
 #include <linux/user_namespace.h>
+#include <net/net_namespace.h>
 
 #define INIT_FDTABLE \
 {                                                       \
@@ -78,6 +79,7 @@ extern struct nsproxy init_nsproxy;
         .nslock         = __SPIN_LOCK_UNLOCKED(nsproxy.nslock),         \
         .uts_ns         = &init_uts_ns,                                 \
         .mnt_ns         = NULL,                                         \
+        INIT_NET_NS(net_ns)                                             \
         INIT_IPC_NS(ipc_ns)                                             \
         .user_ns        = &init_user_ns,                                \
 }