|
@@ -1067,8 +1067,8 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * timekeeping_inject_sleeptime - Adds suspend interval to timeekeeping values
|
|
|
|
- * @delta: pointer to a timespec delta value
|
|
|
|
|
|
+ * timekeeping_inject_sleeptime64 - Adds suspend interval to timeekeeping values
|
|
|
|
+ * @delta: pointer to a timespec64 delta value
|
|
*
|
|
*
|
|
* This hook is for architectures that cannot support read_persistent_clock
|
|
* This hook is for architectures that cannot support read_persistent_clock
|
|
* because their RTC/persistent clock is only accessible when irqs are enabled.
|
|
* because their RTC/persistent clock is only accessible when irqs are enabled.
|
|
@@ -1076,10 +1076,9 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
|
|
* This function should only be called by rtc_resume(), and allows
|
|
* This function should only be called by rtc_resume(), and allows
|
|
* a suspend offset to be injected into the timekeeping values.
|
|
* a suspend offset to be injected into the timekeeping values.
|
|
*/
|
|
*/
|
|
-void timekeeping_inject_sleeptime(struct timespec *delta)
|
|
|
|
|
|
+void timekeeping_inject_sleeptime64(struct timespec64 *delta)
|
|
{
|
|
{
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
|
struct timekeeper *tk = &tk_core.timekeeper;
|
|
- struct timespec64 tmp;
|
|
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -1094,8 +1093,7 @@ void timekeeping_inject_sleeptime(struct timespec *delta)
|
|
|
|
|
|
timekeeping_forward_now(tk);
|
|
timekeeping_forward_now(tk);
|
|
|
|
|
|
- tmp = timespec_to_timespec64(*delta);
|
|
|
|
- __timekeeping_inject_sleeptime(tk, &tmp);
|
|
|
|
|
|
+ __timekeeping_inject_sleeptime(tk, delta);
|
|
|
|
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
|
timekeeping_update(tk, TK_CLEAR_NTP | TK_MIRROR | TK_CLOCK_WAS_SET);
|
|
|
|
|