diff mbox series

posix-timers: Use new ktime_get_*_ts64() helpers

Message ID 20180618143246.3865099-1-arnd@arndb.de
State Accepted
Commit 58a10456d7175fa674b951f1fd7ead3d9a550db4
Headers show
Series posix-timers: Use new ktime_get_*_ts64() helpers | expand

Commit Message

Arnd Bergmann June 18, 2018, 2:32 p.m. UTC 
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 <arnd@arndb.de>

---
 kernel/time/posix-stubs.c  |  2 +-
 kernel/time/posix-timers.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.9.0
diff mbox series

Patch

diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index 26203a705011..706e2c7338d2 100644
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -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;
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 4cb8316bb042..234fb699caf1 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -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;
 }