diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-13 12:02:17 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-13 12:02:17 +0800 |
commit | ad592b70ae97800d4f5bf535d45a680649e2789e (patch) | |
tree | 340a684df3e8dc3d893297f43c025c82e94cbb6a /include/asm-generic | |
parent | f96884662e5ca42a3a39854454f5efd04342b48b (diff) | |
parent | b40108b826ed9e1c558f73b9dbabb8d80ded268b (diff) |
Merge tag 'v4.4.7' into linux-linaro-lsk-v4.4
This is the 4.4.7 stable release
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/bitops/lock.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-generic/bitops/lock.h b/include/asm-generic/bitops/lock.h index c30266e94806..8ef0ccbf8167 100644 --- a/include/asm-generic/bitops/lock.h +++ b/include/asm-generic/bitops/lock.h @@ -29,16 +29,16 @@ do { \ * @nr: the bit to set * @addr: the address to start counting from * - * This operation is like clear_bit_unlock, however it is not atomic. - * It does provide release barrier semantics so it can be used to unlock - * a bit lock, however it would only be used if no other CPU can modify - * any bits in the memory until the lock is released (a good example is - * if the bit lock itself protects access to the other bits in the word). + * A weaker form of clear_bit_unlock() as used by __bit_lock_unlock(). If all + * the bits in the word are protected by this lock some archs can use weaker + * ops to safely unlock. + * + * See for example x86's implementation. */ #define __clear_bit_unlock(nr, addr) \ do { \ - smp_mb(); \ - __clear_bit(nr, addr); \ + smp_mb__before_atomic(); \ + clear_bit(nr, addr); \ } while (0) #endif /* _ASM_GENERIC_BITOPS_LOCK_H_ */ |