git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into core/objtool, to pick up dependent commits
[sfrench/cifs-2.6.git]
/
include
/
asm-generic
/
qspinlock.h
diff --git
a/include/asm-generic/qspinlock.h
b/include/asm-generic/qspinlock.h
index 66260777d64470a2ce016b4bb94ed660ab5fa6a0..b37b4ad7eb946633aa520db7b1e0f97fe46562b3 100644
(file)
--- a/
include/asm-generic/qspinlock.h
+++ b/
include/asm-generic/qspinlock.h
@@
-121,6
+121,5
@@
static __always_inline bool virt_spin_lock(struct qspinlock *lock)
#define arch_spin_lock(l) queued_spin_lock(l)
#define arch_spin_trylock(l) queued_spin_trylock(l)
#define arch_spin_unlock(l) queued_spin_unlock(l)
-#define arch_spin_lock_flags(l, f) queued_spin_lock(l)
#endif /* __ASM_GENERIC_QSPINLOCK_H */