|
@@ -703,18 +703,18 @@ void do_gettimeofday(struct timeval *tv)
|
|
|
EXPORT_SYMBOL(do_gettimeofday);
|
|
|
|
|
|
/**
|
|
|
- * do_settimeofday - Sets the time of day
|
|
|
- * @tv: pointer to the timespec variable containing the new time
|
|
|
+ * do_settimeofday64 - Sets the time of day.
|
|
|
+ * @ts: pointer to the timespec64 variable containing the new time
|
|
|
*
|
|
|
* Sets the time of day to the new time and update NTP and notify hrtimers
|
|
|
*/
|
|
|
-int do_settimeofday(const struct timespec *tv)
|
|
|
+int do_settimeofday64(const struct timespec64 *ts)
|
|
|
{
|
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
|
|
- struct timespec64 ts_delta, xt, tmp;
|
|
|
+ struct timespec64 ts_delta, xt;
|
|
|
unsigned long flags;
|
|
|
|
|
|
- if (!timespec_valid_strict(tv))
|
|
|
+ if (!timespec64_valid_strict(ts))
|
|
|
return -EINVAL;
|
|
|
|
|
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
|
@@ -723,13 +723,12 @@ int do_settimeofday(const struct timespec *tv)
|
|
|
timekeeping_forward_now(tk);
|
|
|
|
|
|
xt = tk_xtime(tk);
|
|
|
- ts_delta.tv_sec = tv->tv_sec - xt.tv_sec;
|
|
|
- ts_delta.tv_nsec = tv->tv_nsec - xt.tv_nsec;
|
|
|
+ ts_delta.tv_sec = ts->tv_sec - xt.tv_sec;
|
|
|
+ ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec;
|
|
|
|
|
|
tk_set_wall_to_mono(tk, timespec64_sub(tk->wall_to_monotonic, ts_delta));
|
|
|
|
|
|
- tmp = timespec_to_timespec64(*tv);
|
|
|
- tk_set_xtime(tk, &tmp);
|
|
|
+ tk_set_xtime(tk, ts);
|
|
|
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
|
|
|
|
@@ -741,7 +740,7 @@ int do_settimeofday(const struct timespec *tv)
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
-EXPORT_SYMBOL(do_settimeofday);
|
|
|
+EXPORT_SYMBOL(do_settimeofday64);
|
|
|
|
|
|
/**
|
|
|
* timekeeping_inject_offset - Adds or subtracts from the current time.
|