Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c

1 files changed, 0 insertions, 5 deletions

diff --git a/ipc/msgutil.c b/ipc/msgutil.c
index 8b5ce5d3f3ef..5652101cdac0 100644
--- a/ipc/msgutil.c
+++ b/ipc/msgutil.c
@@ -27,11 +27,6 @@ DEFINE_SPINLOCK(mq_lock);
  */
 struct ipc_namespace init_ipc_ns = {
         .count          = ATOMIC_INIT(1),
-#ifdef CONFIG_POSIX_MQUEUE
-        .mq_queues_max   = DFLT_QUEUESMAX,
-        .mq_msg_max      = DFLT_MSGMAX,
-        .mq_msgsize_max  = DFLT_MSGSIZEMAX,
-#endif
         .user_ns = &init_user_ns,
 };