diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/linux/msg.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
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 */ |