diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-04-14 11:23:14 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-04-14 11:23:14 +1000 |
| commit | ecd740c6f2f092b90b95fa35f757973589eaaca2 (patch) | |
| tree | ce02b1e18c4fc5729699251460cd8be7604d8401 /include/uapi/linux/msg.h | |
| parent | f64410ec665479d7b4b77b7519e814253ed0f686 (diff) | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
| download | cachepc-linux-ecd740c6f2f092b90b95fa35f757973589eaaca2.tar.gz cachepc-linux-ecd740c6f2f092b90b95fa35f757973589eaaca2.zip | |
Merge commit 'v3.14' into next
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 { /* message buffer for msgsnd and msgrcv calls */ struct msgbuf { - long mtype; /* type of message */ - char mtext[1]; /* message text */ + __kernel_long_t mtype; /* type of message */ + char mtext[1]; /* message text */ }; /* buffer for msgctl calls IPC_INFO, MSG_INFO */ |