ipc: add definitions of USHORT_MAX and others
Add definitions of USHORT_MAX and others into kernel. ipc uses it and slub implementation might also use it. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com> Reviewed-by: Christoph Lameter <clameter@sgi.com> Cc: Nadia Derbey <Nadia.Derbey@bull.net> Cc: "Pierre Peiffer" <peifferp@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
a5f75e7f25
Коммит
44f564a4bf
|
@ -20,6 +20,9 @@
|
|||
extern const char linux_banner[];
|
||||
extern const char linux_proc_banner[];
|
||||
|
||||
#define USHORT_MAX ((u16)(~0U))
|
||||
#define SHORT_MAX ((s16)(USHORT_MAX>>1))
|
||||
#define SHORT_MIN (-SHORT_MAX - 1)
|
||||
#define INT_MAX ((int)(~0U>>1))
|
||||
#define INT_MIN (-INT_MAX - 1)
|
||||
#define UINT_MAX (~0U)
|
||||
|
|
12
ipc/msg.c
12
ipc/msg.c
|
@ -346,19 +346,19 @@ copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version)
|
|||
out.msg_rtime = in->msg_rtime;
|
||||
out.msg_ctime = in->msg_ctime;
|
||||
|
||||
if (in->msg_cbytes > USHRT_MAX)
|
||||
out.msg_cbytes = USHRT_MAX;
|
||||
if (in->msg_cbytes > USHORT_MAX)
|
||||
out.msg_cbytes = USHORT_MAX;
|
||||
else
|
||||
out.msg_cbytes = in->msg_cbytes;
|
||||
out.msg_lcbytes = in->msg_cbytes;
|
||||
|
||||
if (in->msg_qnum > USHRT_MAX)
|
||||
out.msg_qnum = USHRT_MAX;
|
||||
if (in->msg_qnum > USHORT_MAX)
|
||||
out.msg_qnum = USHORT_MAX;
|
||||
else
|
||||
out.msg_qnum = in->msg_qnum;
|
||||
|
||||
if (in->msg_qbytes > USHRT_MAX)
|
||||
out.msg_qbytes = USHRT_MAX;
|
||||
if (in->msg_qbytes > USHORT_MAX)
|
||||
out.msg_qbytes = USHORT_MAX;
|
||||
else
|
||||
out.msg_qbytes = in->msg_qbytes;
|
||||
out.msg_lqbytes = in->msg_qbytes;
|
||||
|
|
|
@ -133,8 +133,8 @@ void ipc_init_ids(struct ipc_ids *ids)
|
|||
ids->seq = 0;
|
||||
{
|
||||
int seq_limit = INT_MAX/SEQ_MULTIPLIER;
|
||||
if(seq_limit > USHRT_MAX)
|
||||
ids->seq_max = USHRT_MAX;
|
||||
if (seq_limit > USHORT_MAX)
|
||||
ids->seq_max = USHORT_MAX;
|
||||
else
|
||||
ids->seq_max = seq_limit;
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
|
||||
#include <linux/err.h>
|
||||
|
||||
#define USHRT_MAX 0xffff
|
||||
#define SEQ_MULTIPLIER (IPCMNI)
|
||||
|
||||
void sem_init (void);
|
||||
|
|
Загрузка…
Ссылка в новой задаче