4 files changed, 11 insertions, 9 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index ad5d05efcd1a..53839ba265ec 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -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)
diff --git a/ipc/msg.c b/ipc/msg.c
index 4a858f98a760..32494e8cc7a5 100644
--- a/ipc/msg.c
+++ b/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;
diff --git a/ipc/util.c b/ipc/util.c
index c4f1d33b89e4..4c465cb22360 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -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;
         }
diff --git a/ipc/util.h b/ipc/util.h
index 791c5c012718..cdb966aebe07 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -12,7 +12,6 @@
 
 #include <linux/err.h>
 
-#define USHRT_MAX 0xffff
 #define SEQ_MULTIPLIER  (IPCMNI)
 
 void sem_init (void);