Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 44f564a4bf6ac70f2a84806203045cf515bc9367

Authored by Zhang, Yanmin
Committed by Linus Torvalds
1 parent a5f75e7f25
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 4 changed files with 11 additions and 9 deletions Side-by-side Diff

include/linux/kernel.h
Diff comments   View file @ 44f564a
... ... @@ -20,6 +20,9 @@
20 20 extern const char linux_banner[];
21 21 extern const char linux_proc_banner[];
22 22  
  23 +#define USHORT_MAX ((u16)(~0U))
  24 +#define SHORT_MAX ((s16)(USHORT_MAX>>1))
  25 +#define SHORT_MIN (-SHORT_MAX - 1)
23 26 #define INT_MAX ((int)(~0U>>1))
24 27 #define INT_MIN (-INT_MAX - 1)
25 28 #define UINT_MAX (~0U)
... ... @@ -346,19 +346,19 @@
346 346 out.msg_rtime = in->msg_rtime;
347 347 out.msg_ctime = in->msg_ctime;
348 348  
349   - if (in->msg_cbytes > USHRT_MAX)
350   - out.msg_cbytes = USHRT_MAX;
  349 + if (in->msg_cbytes > USHORT_MAX)
  350 + out.msg_cbytes = USHORT_MAX;
351 351 else
352 352 out.msg_cbytes = in->msg_cbytes;
353 353 out.msg_lcbytes = in->msg_cbytes;
354 354  
355   - if (in->msg_qnum > USHRT_MAX)
356   - out.msg_qnum = USHRT_MAX;
  355 + if (in->msg_qnum > USHORT_MAX)
  356 + out.msg_qnum = USHORT_MAX;
357 357 else
358 358 out.msg_qnum = in->msg_qnum;
359 359  
360   - if (in->msg_qbytes > USHRT_MAX)
361   - out.msg_qbytes = USHRT_MAX;
  360 + if (in->msg_qbytes > USHORT_MAX)
  361 + out.msg_qbytes = USHORT_MAX;
362 362 else
363 363 out.msg_qbytes = in->msg_qbytes;
364 364 out.msg_lqbytes = in->msg_qbytes;
... ... @@ -133,8 +133,8 @@
133 133 ids->seq = 0;
134 134 {
135 135 int seq_limit = INT_MAX/SEQ_MULTIPLIER;
136   - if(seq_limit > USHRT_MAX)
137   - ids->seq_max = USHRT_MAX;
  136 + if (seq_limit > USHORT_MAX)
  137 + ids->seq_max = USHORT_MAX;
138 138 else
139 139 ids->seq_max = seq_limit;
140 140 }
... ... @@ -12,7 +12,6 @@
12 12  
13 13 #include <linux/err.h>
14 14  
15   -#define USHRT_MAX 0xffff
16 15 #define SEQ_MULTIPLIER (IPCMNI)
17 16  
18 17 void sem_init (void);