diff options
Diffstat (limited to 'kernel/time/posix-timers.c')
| -rw-r--r-- | kernel/time/posix-timers.c | 26 | 
1 files changed, 17 insertions, 9 deletions
| diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index b6899b5060bd..10b7186d0638 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -252,16 +252,15 @@ static int posix_get_coarse_res(const clockid_t which_clock, struct timespec64 *  	return 0;  } -static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp) +static int posix_get_boottime(const clockid_t which_clock, struct timespec64 *tp)  { -	timekeeping_clocktai64(tp); +	get_monotonic_boottime64(tp);  	return 0;  } -static int posix_get_monotonic_active(clockid_t which_clock, -				      struct timespec64 *tp) +static int posix_get_tai(clockid_t which_clock, struct timespec64 *tp)  { -	ktime_get_active_ts64(tp); +	timekeeping_clocktai64(tp);  	return 0;  } @@ -1317,9 +1316,19 @@ static const struct k_clock clock_tai = {  	.timer_arm		= common_hrtimer_arm,  }; -static const struct k_clock clock_monotonic_active = { +static const struct k_clock clock_boottime = {  	.clock_getres		= posix_get_hrtimer_res, -	.clock_get		= posix_get_monotonic_active, +	.clock_get		= posix_get_boottime, +	.nsleep			= common_nsleep, +	.timer_create		= common_timer_create, +	.timer_set		= common_timer_set, +	.timer_get		= common_timer_get, +	.timer_del		= common_timer_del, +	.timer_rearm		= common_hrtimer_rearm, +	.timer_forward		= common_hrtimer_forward, +	.timer_remaining	= common_hrtimer_remaining, +	.timer_try_to_cancel	= common_hrtimer_try_to_cancel, +	.timer_arm		= common_hrtimer_arm,  };  static const struct k_clock * const posix_clocks[] = { @@ -1330,11 +1339,10 @@ static const struct k_clock * const posix_clocks[] = {  	[CLOCK_MONOTONIC_RAW]		= &clock_monotonic_raw,  	[CLOCK_REALTIME_COARSE]		= &clock_realtime_coarse,  	[CLOCK_MONOTONIC_COARSE]	= &clock_monotonic_coarse, -	[CLOCK_BOOTTIME]		= &clock_monotonic, +	[CLOCK_BOOTTIME]		= &clock_boottime,  	[CLOCK_REALTIME_ALARM]		= &alarm_clock,  	[CLOCK_BOOTTIME_ALARM]		= &alarm_clock,  	[CLOCK_TAI]			= &clock_tai, -	[CLOCK_MONOTONIC_ACTIVE]	= &clock_monotonic_active,  };  static const struct k_clock *clockid_to_kclock(const clockid_t id) |