Merge tag 'xfs-5.6-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[platform/kernel/linux-rpi.git] / kernel / time / posix-cpu-timers.c

diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 42d512f..8ff6da7 100644 (file)
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -1391,26 +1391,26 @@ static int thread_cpu_timer_create(struct k_itimer *timer)
 }
 
 const struct k_clock clock_posix_cpu = {
-       .clock_getres   = posix_cpu_clock_getres,
-       .clock_set      = posix_cpu_clock_set,
-       .clock_get      = posix_cpu_clock_get,
-       .timer_create   = posix_cpu_timer_create,
-       .nsleep         = posix_cpu_nsleep,
-       .timer_set      = posix_cpu_timer_set,
-       .timer_del      = posix_cpu_timer_del,
-       .timer_get      = posix_cpu_timer_get,
-       .timer_rearm    = posix_cpu_timer_rearm,
+       .clock_getres           = posix_cpu_clock_getres,
+       .clock_set              = posix_cpu_clock_set,
+       .clock_get_timespec     = posix_cpu_clock_get,
+       .timer_create           = posix_cpu_timer_create,
+       .nsleep                 = posix_cpu_nsleep,
+       .timer_set              = posix_cpu_timer_set,
+       .timer_del              = posix_cpu_timer_del,
+       .timer_get              = posix_cpu_timer_get,
+       .timer_rearm            = posix_cpu_timer_rearm,
 };
 
 const struct k_clock clock_process = {
-       .clock_getres   = process_cpu_clock_getres,
-       .clock_get      = process_cpu_clock_get,
-       .timer_create   = process_cpu_timer_create,
-       .nsleep         = process_cpu_nsleep,
+       .clock_getres           = process_cpu_clock_getres,
+       .clock_get_timespec     = process_cpu_clock_get,
+       .timer_create           = process_cpu_timer_create,
+       .nsleep                 = process_cpu_nsleep,
 };
 
 const struct k_clock clock_thread = {
-       .clock_getres   = thread_cpu_clock_getres,
-       .clock_get      = thread_cpu_clock_get,
-       .timer_create   = thread_cpu_timer_create,
+       .clock_getres           = thread_cpu_clock_getres,
+       .clock_get_timespec     = thread_cpu_clock_get,
+       .timer_create           = thread_cpu_timer_create,
 };