posix-timers: Use new ktime_get_*_ts64() helpers
PATCH 1/1 posix-timers: Use new ktime_get_*_ts64() helpers
Some of the oddly named time accessor functions now have a more consistent naming, which should be used from now on so we can remove the aliases.
Signed-off-by Arnd Bergmann <[email protected]>
--- kernel/time/posix-stubs.c | 2 +- kernel/time/posix-timers.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
kernel/time/posix-stubs.c +1 -1
@@ -81,7 +81,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)ktime_get_ts64 (tp);break ;case CLOCK_BOOTTIME : -get_monotonic_boottime64 (tp); +ktime_get_boottime_ts64 (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +5 -5
@@ -228,21 +228,21 @@ static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp)*/ static int posix_get_monotonic_raw (clockid_t which_clock,struct timespec64 *tp) { -getrawmonotonic64 (tp); +ktime_get_raw_ts64 (tp);return 0 ; }static int posix_get_realtime_coarse (clockid_t which_clock,struct timespec64 *tp) { - *tp =current_kernel_time64 (); +ktime_get_coarse_real_ts64 (tp);return 0 ; }static int posix_get_monotonic_coarse (clockid_t which_clock,struct timespec64 *tp) { - *tp =get_monotonic_coarse64 (); +ktime_get_coarse_ts64 (tp);return 0 ; }
@@ -254,13 +254,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *static int posix_get_boottime (const clockid_t which_clock,struct timespec64 *tp) { -get_monotonic_boottime64 (tp); +ktime_get_boottime_ts64 (tp);return 0 ; }static int posix_get_tai (clockid_t which_clock,struct timespec64 *tp) { -timekeeping_clocktai64 (tp); +ktime_get_clocktai_ts64 (tp);return 0 ; }
Signature · 1 line
2.9.0
tip-bot for Arnd Bergmann
merge botposix-timers: Use new ktime_get_*_ts64() helpers
Commit-ID: 58a10456d7175fa674b951f1fd7ead3d9a550db4 Gitweb: https://git.kernel.org/tip/58a10456d7175fa674b951f1fd7ead3d9a550db4 Author: Arnd Bergmann <[email protected]> AuthorDate: Mon, 18 Jun 2018 16:32:24 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 19 Jun 2018 09:56:27 +0200
posix-timers: Use new ktime_get_*_ts64() helpers
Some of the oddly named time accessor functions now have a more consistent naming, which should be used from now on so the aliases can be removed.
Signed-off-by Arnd Bergmann <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc Deepa Dinamani <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
--- kernel/time/posix-stubs.c | 2 +- kernel/time/posix-timers.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
kernel/time/posix-stubs.c +1 -1
@@ -81,7 +81,7 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp)ktime_get_ts64 (tp);break ;case CLOCK_BOOTTIME : -get_monotonic_boottime64 (tp); +ktime_get_boottime_ts64 (tp);break ;default :return -EINVAL ;
kernel/time/posix-timers.c +5 -5
@@ -228,21 +228,21 @@ static int posix_ktime_get_ts(clockid_t which_clock, struct timespec64 *tp)*/ static int posix_get_monotonic_raw (clockid_t which_clock,struct timespec64 *tp) { -getrawmonotonic64 (tp); +ktime_get_raw_ts64 (tp);return 0 ; }static int posix_get_realtime_coarse (clockid_t which_clock,struct timespec64 *tp) { - *tp =current_kernel_time64 (); +ktime_get_coarse_real_ts64 (tp);return 0 ; }static int posix_get_monotonic_coarse (clockid_t which_clock,struct timespec64 *tp) { - *tp =get_monotonic_coarse64 (); +ktime_get_coarse_ts64 (tp);return 0 ; }
@@ -254,13 +254,13 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *static int posix_get_boottime (const clockid_t which_clock,struct timespec64 *tp) { -get_monotonic_boottime64 (tp); +ktime_get_boottime_ts64 (tp);return 0 ; }static int posix_get_tai (clockid_t which_clock,struct timespec64 *tp) { -timekeeping_clocktai64 (tp); +ktime_get_clocktai_ts64 (tp);return 0 ; }