diff --git a/[refs] b/[refs]
index 8640bd3ffd8a..fb45381fb1cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5cc9c7b1a3e7ae4d700d9fce168fb597bcfe9b6
+refs/heads/master: 9cf18e1dd74cd0061d58ac55029784ca3dd88f6a
diff --git a/trunk/include/linux/ipc_namespace.h b/trunk/include/linux/ipc_namespace.h
index e408722a84c7..07baa38bce37 100644
--- a/trunk/include/linux/ipc_namespace.h
+++ b/trunk/include/linux/ipc_namespace.h
@@ -87,7 +87,7 @@ extern int mq_init_ns(struct ipc_namespace *ns);
 /* default values */
 #define DFLT_QUEUESMAX 256     /* max number of message queues */
 #define DFLT_MSGMAX    10      /* max number of messages in each queue */
-#define HARD_MSGMAX    (131072/sizeof(void *))
+#define HARD_MSGMAX    (32768*sizeof(void *)/4)
 #define DFLT_MSGSIZEMAX 8192   /* max message size */
 #else
 static inline int mq_init_ns(struct ipc_namespace *ns) { return 0; }