Merge branch 'linux-3.17' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

[pandora-kernel.git] / sound / core / timer.c

diff --git a/sound/core/timer.c b/sound/core/timer.c
index cfd455a..777a45e 100644 (file)
--- 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);
        }