summaryrefslogtreecommitdiff
path: root/lib/lockref.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-12-12 10:46:15 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-12-12 10:46:15 +0100
commit8494bd0e86271fb21581d27e3c5d6a369b5208ca (patch)
tree65572b9ad90b016f8fcb7e1964f8536c7dc588f9 /lib/lockref.c
parentd6d63b51fe3bfea0cf596993afa480b0b3b02c32 (diff)
parente7d820a5e549b3eb6c3f9467507566565646a669 (diff)
Merge remote-tracking branch 'tip/x86/cpufeature' into kvm-next
Diffstat (limited to 'lib/lockref.c')
-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.
*/