Both x32 and x86-64 use the same struct mq_attr for system calls.  But
x32 long is 32-bit. This patch replaces long with __kernel_long_t in
struct mq_attr if __BITS_PER_LONG == 64.

Signed-off-by: H.J. Lu <hjl.to...@gmail.com>
---
 include/uapi/linux/mqueue.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/include/uapi/linux/mqueue.h b/include/uapi/linux/mqueue.h
index 8b5a796..03bf30e 100644
--- a/include/uapi/linux/mqueue.h
+++ b/include/uapi/linux/mqueue.h
@@ -23,11 +23,19 @@
 #define MQ_BYTES_MAX   819200
 
 struct mq_attr {
-       long    mq_flags;       /* message queue flags                  */
-       long    mq_maxmsg;      /* maximum number of messages           */
-       long    mq_msgsize;     /* maximum message size                 */
-       long    mq_curmsgs;     /* number of messages currently queued  */
-       long    __reserved[4];  /* ignored for input, zeroed for output */
+#if __BITS_PER_LONG == 64
+       __kernel_long_t mq_flags;       /* message queue flags                  
*/
+       __kernel_long_t mq_maxmsg;      /* maximum number of messages           
*/
+       __kernel_long_t mq_msgsize;     /* maximum message size                 
*/
+       __kernel_long_t mq_curmsgs;     /* number of messages currently queued  
*/
+       __kernel_long_t __reserved[4];  /* ignored for input, zeroed for output 
*/
+#else
+       long    mq_flags;               /* message queue flags                  
*/
+       long    mq_maxmsg;              /* maximum number of messages           
*/
+       long    mq_msgsize;             /* maximum message size                 
*/
+       long    mq_curmsgs;             /* number of messages currently queued  
*/
+       long    __reserved[4];          /* ignored for input, zeroed for output 
*/
+#endif
 };
 
 /*
-- 
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to