diff options
author | Jonathan Corbet <corbet@lwn.net> | 2017-05-18 13:03:08 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2017-05-18 13:03:08 -0400 |
commit | 6312811be26f4a97fb36f53ffffafa5086833a28 (patch) | |
tree | 66082d254d384ed1a5ac869f9b5c96aa78bab95b /kernel/locking | |
parent | 468f8763fea195f27ce851bded540de5c799628d (diff) | |
parent | 5d47c31b59f6c2c7ddce0fcb1be0f85ad39a56fe (diff) |
Merge remote-tracking branch 'mauro-exp/docbook3' into death-to-docbook
Mauro says:
This patch series convert the remaining DocBooks to ReST.
The first version was originally
send as 3 patch series:
[PATCH 00/36] Convert DocBook documents to ReST
[PATCH 0/5] Convert more books to ReST
[PATCH 00/13] Get rid of DocBook
The lsm book was added as if it were a text file under
Documentation. The plan is to merge it with another file
under Documentation/security, after both this series and
a security Documentation patch series gets merged.
It also adjusts some Sphinx-pedantic errors/warnings on
some kernel-doc markups.
I also added some patches here to add PDF output for all
existing ReST books.
Diffstat (limited to 'kernel/locking')
-rw-r--r-- | kernel/locking/mutex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 198527a62149..858a07590e39 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c | |||
@@ -227,9 +227,9 @@ static void __sched __mutex_lock_slowpath(struct mutex *lock); | |||
227 | * (or statically defined) before it can be locked. memset()-ing | 227 | * (or statically defined) before it can be locked. memset()-ing |
228 | * the mutex to 0 is not allowed. | 228 | * the mutex to 0 is not allowed. |
229 | * | 229 | * |
230 | * ( The CONFIG_DEBUG_MUTEXES .config option turns on debugging | 230 | * (The CONFIG_DEBUG_MUTEXES .config option turns on debugging |
231 | * checks that will enforce the restrictions and will also do | 231 | * checks that will enforce the restrictions and will also do |
232 | * deadlock debugging. ) | 232 | * deadlock debugging) |
233 | * | 233 | * |
234 | * This function is similar to (but not equivalent to) down(). | 234 | * This function is similar to (but not equivalent to) down(). |
235 | */ | 235 | */ |