diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-20 06:43:05 +0200 |
commit | e5af5ff34cf037ac7bb70976161427dc40bf4a96 (patch) | |
tree | 3a0c3f8e859562c333e5229ac9fe09d004a45405 /kernel/time/timekeeping_debug.c | |
parent | timer: Fix coding style (diff) | |
parent | time: Introduce one suspend clocksource to compensate the suspend time (diff) | |
download | linux-e5af5ff34cf037ac7bb70976161427dc40bf4a96.tar.xz linux-e5af5ff34cf037ac7bb70976161427dc40bf4a96.zip |
Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull the second set of timekeeping things for 4.19 from John Stultz
* NTP argument clenaups and constification from Ondrej Mosnacek
* Fix to avoid RTC injecting sleeptime when suspend fails from
Mukesh Ojha
* Broading suspsend-timing to include non-stop clocksources that
aren't currently used for timekeeping from Baolin Wang
Diffstat (limited to 'kernel/time/timekeeping_debug.c')
-rw-r--r-- | kernel/time/timekeeping_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping_debug.c b/kernel/time/timekeeping_debug.c index 0754cadfa9e6..238e4be60229 100644 --- a/kernel/time/timekeeping_debug.c +++ b/kernel/time/timekeeping_debug.c @@ -70,7 +70,7 @@ static int __init tk_debug_sleep_time_init(void) } late_initcall(tk_debug_sleep_time_init); -void tk_debug_account_sleep_time(struct timespec64 *t) +void tk_debug_account_sleep_time(const struct timespec64 *t) { /* Cap bin index so we don't overflow the array */ int bin = min(fls(t->tv_sec), NUM_BINS-1); |