aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2010-05-24 17:33:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:07:02 -0400
commit4be929be34f9bdeffa40d815d32d7d60d2c7f03b (patch)
tree4d2c6e2b8ef766e565e2e050ee151de2e02081d3 /ipc
parent940370fc86b920b51a34217a1facc3e9e97c2456 (diff)
kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN
- C99 knows about USHRT_MAX/SHRT_MAX/SHRT_MIN, not USHORT_MAX/SHORT_MAX/SHORT_MIN. - Make SHRT_MIN of type s16, not int, for consistency. [akpm@linux-foundation.org: fix drivers/dma/timb_dma.c] [akpm@linux-foundation.org: fix security/keys/keyring.c] Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/msg.c12
-rw-r--r--ipc/util.c4
2 files changed, 8 insertions, 8 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index 9547cb7ac313..747b65507a91 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -345,19 +345,19 @@ copy_msqid_to_user(void __user *buf, struct msqid64_ds *in, int version)
345 out.msg_rtime = in->msg_rtime; 345 out.msg_rtime = in->msg_rtime;
346 out.msg_ctime = in->msg_ctime; 346 out.msg_ctime = in->msg_ctime;
347 347
348 if (in->msg_cbytes > USHORT_MAX) 348 if (in->msg_cbytes > USHRT_MAX)
349 out.msg_cbytes = USHORT_MAX; 349 out.msg_cbytes = USHRT_MAX;
350 else 350 else
351 out.msg_cbytes = in->msg_cbytes; 351 out.msg_cbytes = in->msg_cbytes;
352 out.msg_lcbytes = in->msg_cbytes; 352 out.msg_lcbytes = in->msg_cbytes;
353 353
354 if (in->msg_qnum > USHORT_MAX) 354 if (in->msg_qnum > USHRT_MAX)
355 out.msg_qnum = USHORT_MAX; 355 out.msg_qnum = USHRT_MAX;
356 else 356 else
357 out.msg_qnum = in->msg_qnum; 357 out.msg_qnum = in->msg_qnum;
358 358
359 if (in->msg_qbytes > USHORT_MAX) 359 if (in->msg_qbytes > USHRT_MAX)
360 out.msg_qbytes = USHORT_MAX; 360 out.msg_qbytes = USHRT_MAX;
361 else 361 else
362 out.msg_qbytes = in->msg_qbytes; 362 out.msg_qbytes = in->msg_qbytes;
363 out.msg_lqbytes = in->msg_qbytes; 363 out.msg_lqbytes = in->msg_qbytes;
diff --git a/ipc/util.c b/ipc/util.c
index 79ce84e890f7..69a0cc13d966 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -124,8 +124,8 @@ void ipc_init_ids(struct ipc_ids *ids)
124 ids->seq = 0; 124 ids->seq = 0;
125 { 125 {
126 int seq_limit = INT_MAX/SEQ_MULTIPLIER; 126 int seq_limit = INT_MAX/SEQ_MULTIPLIER;
127 if (seq_limit > USHORT_MAX) 127 if (seq_limit > USHRT_MAX)
128 ids->seq_max = USHORT_MAX; 128 ids->seq_max = USHRT_MAX;
129 else 129 else
130 ids->seq_max = seq_limit; 130 ids->seq_max = seq_limit;
131 } 131 }