diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
| commit | e80b89ee2ace3a959c44c834231851fc5242eb13 (patch) | |
| tree | ec8cd7a9cd05002261fbfda9b4ea4f66d1e04f7b /lib/lockref.c | |
| parent | 85cfe6b64d785b170367322d9d130a530db7b276 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
Merge tag 'v3.13-rc2' into spi-rcar
Linux 3.13-rc2
Diffstat (limited to 'lib/lockref.c')
| -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 d2b123f8456..f07a40d3387 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. */ |