diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-11-27 13:52:53 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-27 20:37:33 -0800 |
| commit | 14058d20c155ab3ff473fb60eca4fa7aa21a16ac (patch) | |
| tree | f3dce2c56c81c4299a468c382d2513b5e6170905 | |
| parent | dad337501d490b26fbf8d83baee99c788461c61c (diff) | |
| download | linux-stable-14058d20c155ab3ff473fb60eca4fa7aa21a16ac.tar.gz linux-stable-14058d20c155ab3ff473fb60eca4fa7aa21a16ac.tar.bz2 linux-stable-14058d20c155ab3ff473fb60eca4fa7aa21a16ac.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>
| -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 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. */ |