On 2018-06-18 11:35 AM, Arnd Bergmann wrote:
> getrawmonotonic64() and get_monotonic_boottime64() are deprecated
> because of the nonstandard naming.
>
> The replacement functions ktime_get_raw_ns() and ktime_get_boot_ns()
> also simplify the callers.
>
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
In case this hasn't been submitted yet, this patch is Reviewed-by: Felix
Kuehling <Felix.Kuehling at amd.com>.
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index f64c5551cdba..7e717716b90e 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -754,7 +754,6 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,
> {
> struct kfd_ioctl_get_clock_counters_args *args = data;
> struct kfd_dev *dev;
> - struct timespec64 time;
>
> dev = kfd_device_by_id(args->gpu_id);
> if (dev)
> @@ -766,11 +765,8 @@ static int kfd_ioctl_get_clock_counters(struct file *filep,
> args->gpu_clock_counter = 0;
>
> /* No access to rdtsc. Using raw monotonic time */
> - getrawmonotonic64(&time);
> - args->cpu_clock_counter = (uint64_t)timespec64_to_ns(&time);
> -
> - get_monotonic_boottime64(&time);
> - args->system_clock_counter = (uint64_t)timespec64_to_ns(&time);
> + args->cpu_clock_counter = ktime_get_raw_ns();
> + args->system_clock_counter = ktime_get_boot_ns();
>
> /* Since the counter is in nano-seconds we use 1GHz frequency */
> args->system_clock_freq = 1000000000;
