diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2010-05-24 17:33:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 11:07:02 -0400 |
commit | 4be929be34f9bdeffa40d815d32d7d60d2c7f03b (patch) | |
tree | 4d2c6e2b8ef766e565e2e050ee151de2e02081d3 /ipc/util.c | |
parent | 940370fc86b920b51a34217a1facc3e9e97c2456 (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/util.c')
-rw-r--r-- | ipc/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 | } |