diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-16 16:09:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-16 16:09:30 +0100 |
| commit | 315fba80a664e4bd928e0b85a38d26e60645b96a (patch) | |
| tree | f978ad08f524b671d12b1116dc8bbdc57dd743d8 /include/linux/lockref.h | |
| parent | 356f402da0f989b16e4b6849e88dba5df0e25944 (diff) | |
| parent | c6affc0dba45bb2074ff56b21386d22eeaf682f8 (diff) | |
Merge tag 'asoc-v3.13-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A few small fixes in drivers, nothing too remarkable here but all good
to have - mainly these are fixes for things that were introduced in the
last merge window but only just got useful testing.
Diffstat (limited to 'include/linux/lockref.h')
| -rw-r--r-- | include/linux/lockref.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockref.h b/include/linux/lockref.h index c8929c3832db..4bfde0e99ed5 100644 --- a/include/linux/lockref.h +++ b/include/linux/lockref.h @@ -19,7 +19,7 @@ #define USE_CMPXCHG_LOCKREF \ (IS_ENABLED(CONFIG_ARCH_USE_CMPXCHG_LOCKREF) && \ - IS_ENABLED(CONFIG_SMP) && !BLOATED_SPINLOCKS) + IS_ENABLED(CONFIG_SMP) && SPINLOCK_SIZE <= 4) struct lockref { union { |