8 files changed, 41 insertions, 34 deletions

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index b708c85dc9c1..40d880b8c02f 100644
--- a/drivers/char/mmtimer.c
+++ b/drivers/char/mmtimer.c
@@ -478,13 +478,13 @@ static int sgi_clock_period;
 static struct timespec sgi_clock_offset;
 static int sgi_clock_period;
 
-static int sgi_clock_get(clockid_t clockid, struct timespec *tp)
+static int sgi_clock_get(clockid_t clockid, struct timespec64 *tp)
 {
         u64 nsec;
 
         nsec = rtc_time() * sgi_clock_period
                         + sgi_clock_offset.tv_nsec;
-        *tp = ns_to_timespec(nsec);
+        *tp = ns_to_timespec64(nsec);
         tp->tv_sec += sgi_clock_offset.tv_sec;
         return 0;
 };
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index 64aa189efe21..0688f3975da7 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -90,7 +90,7 @@ struct k_clock {
         int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
         int (*clock_set) (const clockid_t which_clock,
                           const struct timespec *tp);
-        int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
+        int (*clock_get) (const clockid_t which_clock, struct timespec64 *tp);
         int (*clock_adj) (const clockid_t which_clock, struct timex *tx);
         int (*timer_create) (struct k_itimer *timer);
         int (*nsleep) (const clockid_t which_clock, int flags,
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h
index 3617a78897bb..ddc229ff6d1e 100644
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
@@ -258,6 +258,11 @@ static inline void timekeeping_clocktai(struct timespec *ts)
         *ts = ktime_to_timespec(ktime_get_clocktai());
 }
 
+static inline void timekeeping_clocktai64(struct timespec64 *ts)
+{
+        *ts = ktime_to_timespec64(ktime_get_clocktai());
+}
+
 /*
  * RTC specific
  */
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index ce3a31e8eb36..944ca6e6f1c2 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -558,14 +558,14 @@ static int alarm_clock_getres(const clockid_t which_clock, struct timespec *tp)
  *
  * Provides the underlying alarm base time.
  */
-static int alarm_clock_get(clockid_t which_clock, struct timespec *tp)
+static int alarm_clock_get(clockid_t which_clock, struct timespec64 *tp)
 {
         struct alarm_base *base = &alarm_bases[clock2alarm(which_clock)];
 
         if (!alarmtimer_get_rtcdev())
                 return -EINVAL;
 
-        *tp = ktime_to_timespec(base->gettime());
+        *tp = ktime_to_timespec64(base->gettime());
         return 0;
 }
 
diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index e24008c098c6..fab6bd33155e 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -297,20 +297,17 @@ out:
         return err;
 }
 
-static int pc_clock_gettime(clockid_t id, struct timespec *ts)
+static int pc_clock_gettime(clockid_t id, struct timespec64 *ts)
 {
         struct posix_clock_desc cd;
-        struct timespec64 ts64;
         int err;
 
         err = get_clock_desc(id, &cd);
         if (err)
                 return err;
 
-        if (cd.clk->ops.clock_gettime) {
-                err = cd.clk->ops.clock_gettime(cd.clk, &ts64);
-                *ts = timespec64_to_timespec(ts64);
-        }
+        if (cd.clk->ops.clock_gettime)
+                err = cd.clk->ops.clock_gettime(cd.clk, ts);
         else
                 err = -EOPNOTSUPP;
 
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 76bea3a47d4b..082231cc7953 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -261,7 +261,7 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
 
 static int posix_cpu_clock_get_task(struct task_struct *tsk,
                                     const clockid_t which_clock,
-                                    struct timespec *tp)
+                                    struct timespec64 *tp)
 {
         int err = -EINVAL;
         u64 rtn;
@@ -275,13 +275,13 @@ static int posix_cpu_clock_get_task(struct task_struct *tsk,
         }
 
         if (!err)
-                *tp = ns_to_timespec(rtn);
+                *tp = ns_to_timespec64(rtn);
 
         return err;
 }
 
 
-static int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp)
+static int posix_cpu_clock_get(const clockid_t which_clock, struct timespec64 *tp)
 {
         const pid_t pid = CPUCLOCK_PID(which_clock);
         int err = -EINVAL;
@@ -1374,7 +1374,7 @@ static int process_cpu_clock_getres(const clockid_t which_clock,
         return posix_cpu_clock_getres(PROCESS_CLOCK, tp);
 }
 static int process_cpu_clock_get(const clockid_t which_clock,
-                                 struct timespec *tp)
+                                 struct timespec64 *tp)
 {
         return posix_cpu_clock_get(PROCESS_CLOCK, tp);
 }
@@ -1399,7 +1399,7 @@ static int thread_cpu_clock_getres(const clockid_t which_clock,
         return posix_cpu_clock_getres(THREAD_CLOCK, tp);
 }
 static int thread_cpu_clock_get(const clockid_t which_clock,
-                                struct timespec *tp)
+                                struct timespec64 *tp)
 {
         return posix_cpu_clock_get(THREAD_CLOCK, tp);
 }
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index 95a1b1fc3968..0fbd0c5b95ca 100644
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -64,14 +64,17 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
 SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
                 struct timespec __user *,tp)
 {
+        struct timespec64 kernel_tp64;
         struct timespec kernel_tp;
 
         switch (which_clock) {
-        case CLOCK_REALTIME: ktime_get_real_ts(&kernel_tp); break;
-        case CLOCK_MONOTONIC: ktime_get_ts(&kernel_tp); break;
-        case CLOCK_BOOTTIME: get_monotonic_boottime(&kernel_tp); break;
+        case CLOCK_REALTIME: ktime_get_real_ts64(&kernel_tp64); break;
+        case CLOCK_MONOTONIC: ktime_get_ts64(&kernel_tp64); break;
+        case CLOCK_BOOTTIME: get_monotonic_boottime64(&kernel_tp64); break;
         default: return -EINVAL;
         }
+
+        kernel_tp = timespec64_to_timespec(kernel_tp64);
         if (copy_to_user(tp, &kernel_tp, sizeof (kernel_tp)))
                 return -EFAULT;
         return 0;
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index f215ef792772..68170642c77c 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -204,9 +204,9 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
 }
 
 /* Get clock_realtime */
-static int posix_clock_realtime_get(clockid_t which_clock, struct timespec *tp)
+static int posix_clock_realtime_get(clockid_t which_clock, struct timespec64 *tp)
 {
-        ktime_get_real_ts(tp);
+        ktime_get_real_ts64(tp);
         return 0;
 }
 
@@ -229,32 +229,32 @@ static int posix_clock_realtime_adj(const clockid_t which_clock,
 /*
  * Get monotonic time for posix timers
  */
-static int posix_ktime_get_ts(clockid_t which_clock, struct timespec *tp)
+static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp)
 {
-        ktime_get_ts(tp);
+        ktime_get_ts64(tp);
         return 0;
 }
 
 /*
  * Get monotonic-raw time for posix timers
  */
-static int posix_get_monotonic_raw(clockid_t which_clock, struct timespec *tp)
+static int posix_get_monotonic_raw(clockid_t which_clock, struct timespec64 *tp)
 {
-        getrawmonotonic(tp);
+        getrawmonotonic64(tp);
         return 0;
 }
 
 
-static int posix_get_realtime_coarse(clockid_t which_clock, struct timespec *tp)
+static int posix_get_realtime_coarse(clockid_t which_clock, struct timespec64 *tp)
 {
-        *tp = current_kernel_time();
+        *tp = current_kernel_time64();
         return 0;
 }
 
 static int posix_get_monotonic_coarse(clockid_t which_clock,
-                                                struct timespec *tp)
+                                                struct timespec64 *tp)
 {
-        *tp = get_monotonic_coarse();
+        *tp = get_monotonic_coarse64();
         return 0;
 }
 
@@ -264,15 +264,15 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec *tp
         return 0;
 }
 
-static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
+static int posix_get_boottime(const clockid_t which_clock, struct timespec64 *tp)
 {
-        get_monotonic_boottime(tp);
+        get_monotonic_boottime64(tp);
         return 0;
 }
 
-static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
+static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp)
 {
-        timekeeping_clocktai(tp);
+        timekeeping_clocktai64(tp);
         return 0;
 }
 
@@ -1032,13 +1032,15 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
                 struct timespec __user *,tp)
 {
         struct k_clock *kc = clockid_to_kclock(which_clock);
+        struct timespec64 kernel_tp64;
         struct timespec kernel_tp;
         int error;
 
         if (!kc)
                 return -EINVAL;
 
-        error = kc->clock_get(which_clock, &kernel_tp);
+        error = kc->clock_get(which_clock, &kernel_tp64);
+        kernel_tp = timespec64_to_timespec(kernel_tp64);
 
         if (!error && copy_to_user(tp, &kernel_tp, sizeof (kernel_tp)))
                 error = -EFAULT;