summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 16:48:22 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-29 16:48:22 -0800
commit45b4539309d82ae04e6ed7de494ae194ca0755aa (patch)
tree2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /lib
parent44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff)
parentdc1ccc48159d63eca5089e507c82c7d22ef60839 (diff)
downloadlinux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.bz2
Merge 3.13-rc2 into driver-core-next
We want those fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/lockref.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/lockref.c b/lib/lockref.c
index d2b123f8456b..f07a40d33871 100644
--- a/lib/lockref.c
+++ b/lib/lockref.c
@@ -1,5 +1,6 @@
#include <linux/export.h>
#include <linux/lockref.h>
+#include <linux/mutex.h>
#if USE_CMPXCHG_LOCKREF
@@ -12,14 +13,6 @@
#endif
/*
- * Allow architectures to override the default cpu_relax() within CMPXCHG_LOOP.
- * This is useful for architectures with an expensive cpu_relax().
- */
-#ifndef arch_mutex_cpu_relax
-# define arch_mutex_cpu_relax() cpu_relax()
-#endif
-
-/*
* Note that the "cmpxchg()" reloads the "old" value for the
* failure case.
*/