summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNadia Derbey <Nadia.Derbey@bull.net>2008-06-05 22:46:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-06 11:29:12 -0700
commit68aa0a206a7a2dd8655a50b36e8274eb87b84544 (patch)
treee087fbc1fcab0ce97d09cd49c43eab4e73d2efb2 /include
parent774533b3e86fa52941c79aa80ab3f0cc511bba7f (diff)
downloadlinux-68aa0a206a7a2dd8655a50b36e8274eb87b84544.tar.gz
linux-68aa0a206a7a2dd8655a50b36e8274eb87b84544.tar.bz2
linux-68aa0a206a7a2dd8655a50b36e8274eb87b84544.zip
ipc: restore MSGPOOL original value
When posting: [PATCH 1/8] Scaling msgmni to the amount of lowmem (see http://article.gmane.org/gmane.linux.kernel/637849/) I changed the MSGPOOL value to make it fit what is said in the man pages (i.e. a size in bytes). But Michael Kerrisk rightly complained that this change could affect the ABI. So I'm posting this patch to make MSGPOOL expressed back in Kbytes. Michael, on his side, has fixed the man page. Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net> Cc: Pierre Peiffer <peifferp@gmail.com> Cc: Manfred Spraul <manfred@colorfullife.com> Acked-by: Michael Kerrisk <mtk.manpages@googlemail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/msg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/msg.h b/include/linux/msg.h
index 6f3b8e79a991..56abf1558fdd 100644
--- a/include/linux/msg.h
+++ b/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__