Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 4 insertions, 1 deletions

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 7e7095974d54..2b491590ebab 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -31,7 +31,10 @@ DEFINE_SPINLOCK(mq_lock);
 struct ipc_namespace init_ipc_ns = {
         .count          = ATOMIC_INIT(1),
         .user_ns = &init_user_ns,
-        .proc_inum = PROC_IPC_INIT_INO,
+        .ns.inum = PROC_IPC_INIT_INO,
+#ifdef CONFIG_IPC_NS
+        .ns.ops = &ipcns_operations,
+#endif
 };
 
 atomic_t nr_ipc_ns = ATOMIC_INIT(1);