diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/linux/msg.h | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'include/linux/msg.h')
| -rw-r--r-- | include/linux/msg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/msg.h b/include/linux/msg.h index 391af8d11cce..e21f9d44307f 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | /* one msg_msg structure for each message */ | 7 | /* one msg_msg structure for each message */ |
| 8 | struct msg_msg { | 8 | struct msg_msg { |
| 9 | struct list_head m_list; | 9 | struct list_head m_list; |
| 10 | long m_type; | 10 | long m_type; |
| 11 | int m_ts; /* message text size */ | 11 | size_t m_ts; /* message text size */ |
| 12 | struct msg_msgseg* next; | 12 | struct msg_msgseg* next; |
| 13 | void *security; | 13 | void *security; |
| 14 | /* the actual message follows immediately */ | 14 | /* the actual message follows immediately */ |