Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a10456 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Thomas Gleixner
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: y2038@lists.linaro.org
Cc: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Link: https://lkml.kernel.org/r/20180618143246.3865099-1-arnd@arndb.de
parent d30faff9

kernel/time/posix-stubs.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

}