3 files changed, 7 insertions, 30 deletions

diff --git a/kernel/audit.h b/kernel/audit.h
index b331d9b83f63..9b110ae17ee3 100644
--- a/kernel/audit.h
+++ b/kernel/audit.h
@@ -182,7 +182,7 @@ struct audit_context {
                         mqd_t                   mqdes;
                         size_t                  msg_len;
                         unsigned int            msg_prio;
-                        struct timespec         abs_timeout;
+                        struct timespec64       abs_timeout;
                 } mq_sendrecv;
                 struct {
                         int                     oflag;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index aac1a41f82bd..ecc23e25c9eb 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1235,11 +1235,11 @@ static void show_special(struct audit_context *context, int *call_panic)
         case AUDIT_MQ_SENDRECV:
                 audit_log_format(ab,
                         "mqdes=%d msg_len=%zd msg_prio=%u "
-                        "abs_timeout_sec=%ld abs_timeout_nsec=%ld",
+                        "abs_timeout_sec=%lld abs_timeout_nsec=%ld",
                         context->mq_sendrecv.mqdes,
                         context->mq_sendrecv.msg_len,
                         context->mq_sendrecv.msg_prio,
-                        context->mq_sendrecv.abs_timeout.tv_sec,
+                        (long long) context->mq_sendrecv.abs_timeout.tv_sec,
                         context->mq_sendrecv.abs_timeout.tv_nsec);
                 break;
         case AUDIT_MQ_NOTIFY:
@@ -2083,15 +2083,15 @@ void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
  *
  */
 void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio,
-                        const struct timespec *abs_timeout)
+                        const struct timespec64 *abs_timeout)
 {
         struct audit_context *context = current->audit_context;
-        struct timespec *p = &context->mq_sendrecv.abs_timeout;
+        struct timespec64 *p = &context->mq_sendrecv.abs_timeout;
 
         if (abs_timeout)
-                memcpy(p, abs_timeout, sizeof(struct timespec));
+                memcpy(p, abs_timeout, sizeof(*p));
         else
-                memset(p, 0, sizeof(struct timespec));
+                memset(p, 0, sizeof(*p));
 
         context->mq_sendrecv.mqdes = mqdes;
         context->mq_sendrecv.msg_len = msg_len;
diff --git a/kernel/compat.c b/kernel/compat.c
index 6f0a0e723a06..772e038d04d9 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -200,29 +200,6 @@ int compat_put_timespec(const struct timespec *ts, void __user *uts)
 }
 EXPORT_SYMBOL_GPL(compat_put_timespec);
 
-int compat_convert_timespec(struct timespec __user **kts,
-                            const void __user *cts)
-{
-        struct timespec ts;
-        struct timespec __user *uts;
-
-        if (!cts || COMPAT_USE_64BIT_TIME) {
-                *kts = (struct timespec __user *)cts;
-                return 0;
-        }
-
-        uts = compat_alloc_user_space(sizeof(ts));
-        if (!uts)
-                return -EFAULT;
-        if (compat_get_timespec(&ts, cts))
-                return -EFAULT;
-        if (copy_to_user(uts, &ts, sizeof(ts)))
-                return -EFAULT;
-
-        *kts = uts;
-        return 0;
-}
-
 int get_compat_itimerval(struct itimerval *o, const struct compat_itimerval __user *i)
 {
         struct compat_itimerval v32;