Merge branch 'linus' into sched/core, to resolve conflicts

Conflicts:
	kernel/sysctl.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/uapi/linux/mqueue.h b/include/uapi/linux/mqueue.h
index 8b5a79615fbf..d0a2b8e89813 100644
--- a/include/uapi/linux/mqueue.h
+++ b/include/uapi/linux/mqueue.h
@@ -23,11 +23,11 @@
 #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 */
+        __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 */
 };
 
 /*