diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-07-27 12:56:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-07-27 12:56:48 +0200 |
| commit | c6f830af2bc71bc400123ab4886672e762f13b91 (patch) | |
| tree | 312059f4f26320236752513b89e2c3a8d47f5ee5 | |
| parent | 081efe23f0a4a16a84454dbafe1ed03389fd958f (diff) | |
| parent | 77b52ac71dfbd01b09da0b9401af895756be0735 (diff) | |
| download | alsa-driver-build-unstable-c6f830af2bc71bc400123ab4886672e762f13b91.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/acore/hrtimer.patch | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/alsa/acore/hrtimer.patch b/alsa/acore/hrtimer.patch index 8e7ab51f2..30f397f48 100644 --- a/alsa/acore/hrtimer.patch +++ b/alsa/acore/hrtimer.patch @@ -1,11 +1,11 @@ ---- ../alsa-kernel/core/hrtimer.c 2009-12-11 14:40:22.000000000 +0100 -+++ hrtimer.c 2009-12-15 22:17:50.000000000 +0100 +--- ../alsa-kernel/core/hrtimer.c 2015-07-24 20:09:03.433652027 +0200 ++++ hrtimer.c 2015-07-27 12:54:09.682380313 +0200 @@ -1,3 +1,4 @@ +#include "adriver.h" /* * ALSA timer back-end using hrtimer * Copyright (C) 2008 Takashi Iwai -@@ -65,6 +66,11 @@ +@@ -67,6 +68,11 @@ return -ENOMEM; hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); stime->timer = t; @@ -17,3 +17,17 @@ stime->hrt.function = snd_hrtimer_callback; atomic_set(&stime->running, 0); t->private_data = stime; +@@ -123,7 +129,13 @@ + struct snd_timer *timer; + int err; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) + resolution = hrtimer_resolution; ++#else ++ struct timespec tp; ++ hrtimer_get_res(CLOCK_MONOTONIC, &tp); ++ resolution = tp.tv_nsec; ++#endif + + /* Create a new timer and set up the fields */ + err = snd_timer_global_new("hrtimer", SNDRV_TIMER_GLOBAL_HRTIMER, |