Merge tag 'stackleak-v4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index 883642cf2b2767ae7c05b9eb19841d5f16c230ca..0833c640591561dc907a443ce4b9dc61cfbab638 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -622,9 +622,9 @@ struct compat_msqid_ds {
        struct compat_ipc_perm msg_perm;
        compat_uptr_t msg_first;
        compat_uptr_t msg_last;
-       compat_time_t msg_stime;
-       compat_time_t msg_rtime;
-       compat_time_t msg_ctime;
+       old_time32_t msg_stime;
+       old_time32_t msg_rtime;
+       old_time32_t msg_ctime;
        compat_ulong_t msg_lcbytes;
        compat_ulong_t msg_lqbytes;
        unsigned short msg_cbytes;