diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-05 18:17:08 +0300 |
| commit | c2f4160b77f1e12b2c05f2253575617faf0c69d0 (patch) | |
| tree | a04ab897d2bc2a756d8ef780684538bb993ff4ab /include/asm-generic/qspinlock.h | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| parent | 7e50711993552800644a4667daa0f569a7665eca (diff) | |
| download | linux-c2f4160b77f1e12b2c05f2253575617faf0c69d0.tar.xz | |
Merge tag 'ib-mfd-regulator-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps6105x
Immutable branch between MFD and Regulator due for v4.3
Diffstat (limited to 'include/asm-generic/qspinlock.h')
| -rw-r--r-- | include/asm-generic/qspinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/qspinlock.h b/include/asm-generic/qspinlock.h index 83bfb87f5bf1..e2aadbc7151f 100644 --- 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; } |