diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /include/uapi/linux/msg.h | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/msg.h')
| -rw-r--r-- | include/uapi/linux/msg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/msg.h b/include/uapi/linux/msg.h index 22d95c6854e0..a70375526578 100644 --- a/include/uapi/linux/msg.h +++ b/include/uapi/linux/msg.h | |||
| @@ -34,8 +34,8 @@ struct msqid_ds { | |||
| 34 | 34 | ||
| 35 | /* message buffer for msgsnd and msgrcv calls */ | 35 | /* message buffer for msgsnd and msgrcv calls */ |
| 36 | struct msgbuf { | 36 | struct msgbuf { |
| 37 | long mtype; /* type of message */ | 37 | __kernel_long_t mtype; /* type of message */ |
| 38 | char mtext[1]; /* message text */ | 38 | char mtext[1]; /* message text */ |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | /* buffer for msgctl calls IPC_INFO, MSG_INFO */ | 41 | /* buffer for msgctl calls IPC_INFO, MSG_INFO */ |