summaryrefslogtreecommitdiffstats
path: root/ipc/mqueue.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-04-13 07:58:00 -0400
committerArnd Bergmann <arnd@arndb.de>2018-04-20 10:20:24 -0400
commit21fc538d817ce671f1a28a03996c715247c2ac89 (patch)
tree265b0b588916266eb42e35435c8ea060089a7983 /ipc/mqueue.c
parentc2ab975c30f0c3d3efcd69c1f1b2baa831c9374f (diff)
y2038: ipc: Use __kernel_timespec
This is a preparatation for changing over __kernel_timespec to 64-bit times, which involves assigning new system call numbers for mq_timedsend(), mq_timedreceive() and semtimedop() for compatibility with future y2038 proof user space. The existing ABIs will remain available through compat code. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r--ipc/mqueue.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a808f29d4c5a..9610afcfa2e5 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -691,7 +691,7 @@ static void __do_notify(struct mqueue_inode_info *info)
691 wake_up(&info->wait_q); 691 wake_up(&info->wait_q);
692} 692}
693 693
694static int prepare_timeout(const struct timespec __user *u_abs_timeout, 694static int prepare_timeout(const struct __kernel_timespec __user *u_abs_timeout,
695 struct timespec64 *ts) 695 struct timespec64 *ts)
696{ 696{
697 if (get_timespec64(ts, u_abs_timeout)) 697 if (get_timespec64(ts, u_abs_timeout))
@@ -1128,7 +1128,7 @@ out:
1128 1128
1129SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, 1129SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
1130 size_t, msg_len, unsigned int, msg_prio, 1130 size_t, msg_len, unsigned int, msg_prio,
1131 const struct timespec __user *, u_abs_timeout) 1131 const struct __kernel_timespec __user *, u_abs_timeout)
1132{ 1132{
1133 struct timespec64 ts, *p = NULL; 1133 struct timespec64 ts, *p = NULL;
1134 if (u_abs_timeout) { 1134 if (u_abs_timeout) {
@@ -1142,7 +1142,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,
1142 1142
1143SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, 1143SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
1144 size_t, msg_len, unsigned int __user *, u_msg_prio, 1144 size_t, msg_len, unsigned int __user *, u_msg_prio,
1145 const struct timespec __user *, u_abs_timeout) 1145 const struct __kernel_timespec __user *, u_abs_timeout)
1146{ 1146{
1147 struct timespec64 ts, *p = NULL; 1147 struct timespec64 ts, *p = NULL;
1148 if (u_abs_timeout) { 1148 if (u_abs_timeout) {