Commit 68aa0a20 authored Jun 05, 2008 by Nadia Derbey Committed by Linus Torvalds Jun 06, 2008

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>

parent 774533b3

include/linux/msg.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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__

Admin message