diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-11-27 13:52:53 +0000 |
|---|---|---|
| committer | Maciej Wereski <m.wereski@partner.samsung.com> | 2015-03-18 09:47:13 +0100 |
| commit | 1e36fe71b2055b5187300e0a451f24fd1ab47fd9 (patch) | |
| tree | 4c1d33e1c2af0cbdba22895461178e879b040004 /lib | |
| parent | 682b5fac6b502755a55c1e97d51b29d8542cbae8 (diff) | |
| download | linux-3.10-1e36fe71b2055b5187300e0a451f24fd1ab47fd9.tar.gz linux-3.10-1e36fe71b2055b5187300e0a451f24fd1ab47fd9.tar.bz2 linux-3.10-1e36fe71b2055b5187300e0a451f24fd1ab47fd9.zip | |
lockref: include mutex.h rather than reinvent arch_mutex_cpu_relax
arch_mutex_cpu_relax is already conditionally defined in mutex.h, so
simply include that header rather than replicate the code here.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.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 f88b3fa4494..25e6415668c 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. */ |