Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / ipc / msgutil.c

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 7e7095974d54a10e175dd06504cb8dc6ac73adcb..71f448e5e927aed0ccd8f5af24a928e82cfe616f 100644 (file)
--- 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);
@@ -120,7 +123,7 @@ struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst)
        size_t len = src->m_ts;
        size_t alen;
 
-       BUG_ON(dst == NULL);
+       WARN_ON(dst == NULL);
        if (src->m_ts > dst->m_ts)
                return ERR_PTR(-EINVAL);