diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-30 00:48:22 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-30 00:48:22 (GMT) |
| commit | 45b4539309d82ae04e6ed7de494ae194ca0755aa (patch) | |
| tree | 2ee6f8118fbce7cf8dafbb3ebd2baf69c065769d /lib | |
| parent | 44c3eea650001d85f6adc951b6cd6f2e6fe7a155 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
| download | linux-45b4539309d82ae04e6ed7de494ae194ca0755aa.tar.xz | |
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.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/lockref.c b/lib/lockref.c index d2b123f..f07a40d 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. */ |