diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 09:05:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-15 09:05:26 -0800 |
| commit | e9e3b3002fc3c9ef665628bd85a8c1b5a3424f23 (patch) | |
| tree | a3f867a79cbafb9b5144dad4339e007780c60330 /include | |
| parent | e525de3ab04621d227330aa82cd4073c0b0f3579 (diff) | |
| parent | 2dd6fd2e999774041397f2a7da2e1d30b3a27c3a (diff) | |
| download | linux-e9e3b3002fc3c9ef665628bd85a8c1b5a3424f23.tar.bz2 | |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"This contains two qspinlock fixes and three documentation and comment
fixes"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/semaphore: Update the file path in documentation
locking/atomic/bitops: Document and clarify ordering semantics for failed test_and_{}_bit()
locking/qspinlock: Ensure node->count is updated before initialising node
locking/qspinlock: Ensure node is initialised before updating prev->next
Documentation/locking/mutex-design: Update to reflect latest changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/bitops/lock.h | 3 | ||||
| -rw-r--r-- | include/linux/semaphore.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-generic/bitops/lock.h b/include/asm-generic/bitops/lock.h index bc397573c43a..67ab280ad134 100644 --- a/include/asm-generic/bitops/lock.h +++ b/include/asm-generic/bitops/lock.h @@ -7,7 +7,8 @@ * @nr: Bit to set * @addr: Address to count from * - * This operation is atomic and provides acquire barrier semantics. + * This operation is atomic and provides acquire barrier semantics if + * the returned value is 0. * It can be used to implement bit locks. */ #define test_and_set_bit_lock(nr, addr) test_and_set_bit(nr, addr) diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h index dc368b8ce215..11c86fbfeb98 100644 --- a/include/linux/semaphore.h +++ b/include/linux/semaphore.h @@ -4,7 +4,7 @@ * * Distributed under the terms of the GNU GPL, version 2 * - * Please see kernel/semaphore.c for documentation of these functions + * Please see kernel/locking/semaphore.c for documentation of these functions */ #ifndef __LINUX_SEMAPHORE_H #define __LINUX_SEMAPHORE_H |