diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
commit | 329f0a8a35a664fb33f58f10538f5440ee19c54e (patch) | |
tree | 270e7764e6fe54c982626bd2af294cedf4afbc5f /include/linux/msg.h | |
parent | a5fa2660d787d8416f426cd622778a5d8851ac36 (diff) | |
parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
download | talos-obmc-linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.gz talos-obmc-linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.zip |
Merge 4.13-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/msg.h')
-rw-r--r-- | include/linux/msg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/msg.h b/include/linux/msg.h index f3f302f9c197..a001305f5a79 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h @@ -29,7 +29,7 @@ struct msg_queue { struct list_head q_messages; struct list_head q_receivers; struct list_head q_senders; -}; +} __randomize_layout; /* Helper routines for sys_msgsnd and sys_msgrcv */ extern long do_msgsnd(int msqid, long mtype, void __user *mtext, |