Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/core/timer.c b/sound/core/timer.c
index cfd455a8ac1a..777a45e08e53 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -390,7 +390,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event)
         struct timespec tstamp;
 
         if (timer_tstamp_monotonic)
-                do_posix_clock_monotonic_gettime(&tstamp);
+                ktime_get_ts(&tstamp);
         else
                 getnstimeofday(&tstamp);
         if (snd_BUG_ON(event < SNDRV_TIMER_EVENT_START ||
@@ -1203,7 +1203,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri,
         }
         if (tu->last_resolution != resolution || ticks > 0) {
                 if (timer_tstamp_monotonic)
-                        do_posix_clock_monotonic_gettime(&tstamp);
+                        ktime_get_ts(&tstamp);
                 else
                         getnstimeofday(&tstamp);
         }