diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-03 16:57:41 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-03 16:57:41 +0200 |
commit | 05244d166739ae273fdc7a2151bdef61df49ca7d (patch) | |
tree | 9065482d33f445c90f0b99d29aa51485d1d96488 /lib/lockref.c | |
parent | acf08081adb5e8fe0519eb97bb49797ef52614d6 (diff) | |
parent | f58f0cba15c2d0bfbc72b1eedd0a6294e8c83419 (diff) |
Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17
A few more driver specific fixes on top of the currently pending fixes
(which are already in your tree but not Linus').
Diffstat (limited to 'lib/lockref.c')
-rw-r--r-- | lib/lockref.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/lockref.c b/lib/lockref.c index f07a40d33871..d2233de9a86e 100644 --- a/lib/lockref.c +++ b/lib/lockref.c @@ -1,6 +1,5 @@ #include <linux/export.h> #include <linux/lockref.h> -#include <linux/mutex.h> #if USE_CMPXCHG_LOCKREF @@ -29,7 +28,7 @@ if (likely(old.lock_count == prev.lock_count)) { \ SUCCESS; \ } \ - arch_mutex_cpu_relax(); \ + cpu_relax_lowlatency(); \ } \ } while (0) |