projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'linux-kselftest-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
include
/
asm-generic
/
qspinlock.h
diff --git
a/include/asm-generic/qspinlock.h
b/include/asm-generic/qspinlock.h
index
83bfb87
..
e2aadbc
100644
(file)
--- a/
include/asm-generic/qspinlock.h
+++ b/
include/asm-generic/qspinlock.h
@@
-111,8
+111,8
@@
static inline void queued_spin_unlock_wait(struct qspinlock *lock)
cpu_relax();
}
-#ifndef virt_
queued_
spin_lock
-static __always_inline bool virt_
queued_
spin_lock(struct qspinlock *lock)
+#ifndef virt_spin_lock
+static __always_inline bool virt_spin_lock(struct qspinlock *lock)
{
return false;
}