diff --git a/[refs] b/[refs]
index 9482d903049a..177e4414ffc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 774533b3e86fa52941c79aa80ab3f0cc511bba7f
+refs/heads/master: 68aa0a206a7a2dd8655a50b36e8274eb87b84544
diff --git a/trunk/include/linux/msg.h b/trunk/include/linux/msg.h
index 6f3b8e79a991..56abf1558fdd 100644
--- a/trunk/include/linux/msg.h
+++ b/trunk/include/linux/msg.h
@@ -64,11 +64,11 @@ struct msginfo {
 #define MSGMNB 16384   /* <= INT_MAX */   /* default max size of a message queue */
 
 /* unused */
-#define MSGPOOL (MSGMNI * MSGMNB) /* size in bytes of message pool */
+#define MSGPOOL (MSGMNI * MSGMNB / 1024) /* size in kbytes of message pool */
 #define MSGTQL  MSGMNB            /* number of system message headers */
 #define MSGMAP  MSGMNB            /* number of entries in message map */
 #define MSGSSZ  16                /* message segment size */
-#define __MSGSEG (MSGPOOL / MSGSSZ) /* max no. of segments */
+#define __MSGSEG ((MSGPOOL * 1024) / MSGSSZ) /* max no. of segments */
 #define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
 
 #ifdef __KERNEL__