Skip to content

Commit

Permalink
locking/doc: Update references to kernel/mutex.c
Browse files Browse the repository at this point in the history
Fix this docbook error:

  >> docproc: kernel/mutex.c: No such file or directory

by updating the stale references to kernel/mutex.c.

Reported-by: fengguang.wu@intel.com
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-34pikw1tlsskj65rrt5iusrq@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Nov 11, 2013
1 parent 5ac68e7 commit 67a6de4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Documentation/DocBook/kernel-locking.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1958,7 +1958,7 @@ machines due to caching.
<chapter id="apiref-mutex">
<title>Mutex API reference</title>
!Iinclude/linux/mutex.h
!Ekernel/mutex.c
!Ekernel/locking/mutex.c
</chapter>

<chapter id="apiref-futex">
Expand Down
10 changes: 5 additions & 5 deletions Documentation/mutex-design.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ using mutexes at the moment, please let me know if you find any. ]
Implementation of mutexes
-------------------------

'struct mutex' is the new mutex type, defined in include/linux/mutex.h
and implemented in kernel/mutex.c. It is a counter-based mutex with a
spinlock and a wait-list. The counter has 3 states: 1 for "unlocked",
0 for "locked" and negative numbers (usually -1) for "locked, potential
waiters queued".
'struct mutex' is the new mutex type, defined in include/linux/mutex.h and
implemented in kernel/locking/mutex.c. It is a counter-based mutex with a
spinlock and a wait-list. The counter has 3 states: 1 for "unlocked", 0 for
"locked" and negative numbers (usually -1) for "locked, potential waiters
queued".

the APIs of 'struct mutex' have been streamlined:

Expand Down
2 changes: 1 addition & 1 deletion include/linux/mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static inline int mutex_is_locked(struct mutex *lock)
}

/*
* See kernel/mutex.c for detailed documentation of these APIs.
* See kernel/locking/mutex.c for detailed documentation of these APIs.
* Also see Documentation/mutex-design.txt.
*/
#ifdef CONFIG_DEBUG_LOCK_ALLOC
Expand Down
2 changes: 1 addition & 1 deletion kernel/locking/mutex.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* kernel/mutex.c
* kernel/locking/mutex.c
*
* Mutexes: blocking mutual exclusion locks
*
Expand Down

0 comments on commit 67a6de4

Please sign in to comment.