aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/kernel-locking.tmpl2
-rw-r--r--Documentation/mutex-design.txt10
-rw-r--r--include/linux/mutex.h2
-rw-r--r--kernel/locking/mutex.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl
index 09e884e5b9f5..19f2a5a5a5b4 100644
--- a/Documentation/DocBook/kernel-locking.tmpl
+++ b/Documentation/DocBook/kernel-locking.tmpl
@@ -1958,7 +1958,7 @@ machines due to caching.
1958 <chapter id="apiref-mutex"> 1958 <chapter id="apiref-mutex">
1959 <title>Mutex API reference</title> 1959 <title>Mutex API reference</title>
1960!Iinclude/linux/mutex.h 1960!Iinclude/linux/mutex.h
1961!Ekernel/mutex.c 1961!Ekernel/locking/mutex.c
1962 </chapter> 1962 </chapter>
1963 1963
1964 <chapter id="apiref-futex"> 1964 <chapter id="apiref-futex">
diff --git a/Documentation/mutex-design.txt b/Documentation/mutex-design.txt
index 38c10fd7f411..1dfe62c3641d 100644
--- a/Documentation/mutex-design.txt
+++ b/Documentation/mutex-design.txt
@@ -116,11 +116,11 @@ using mutexes at the moment, please let me know if you find any. ]
116Implementation of mutexes 116Implementation of mutexes
117------------------------- 117-------------------------
118 118
119'struct mutex' is the new mutex type, defined in include/linux/mutex.h 119'struct mutex' is the new mutex type, defined in include/linux/mutex.h and
120and implemented in kernel/mutex.c. It is a counter-based mutex with a 120implemented in kernel/locking/mutex.c. It is a counter-based mutex with a
121spinlock and a wait-list. The counter has 3 states: 1 for "unlocked", 121spinlock and a wait-list. The counter has 3 states: 1 for "unlocked", 0 for
1220 for "locked" and negative numbers (usually -1) for "locked, potential 122"locked" and negative numbers (usually -1) for "locked, potential waiters
123waiters queued". 123queued".
124 124
125the APIs of 'struct mutex' have been streamlined: 125the APIs of 'struct mutex' have been streamlined:
126 126
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index bab49da8a0f0..d3181936c138 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -131,7 +131,7 @@ static inline int mutex_is_locked(struct mutex *lock)
131} 131}
132 132
133/* 133/*
134 * See kernel/mutex.c for detailed documentation of these APIs. 134 * See kernel/locking/mutex.c for detailed documentation of these APIs.
135 * Also see Documentation/mutex-design.txt. 135 * Also see Documentation/mutex-design.txt.
136 */ 136 */
137#ifdef CONFIG_DEBUG_LOCK_ALLOC 137#ifdef CONFIG_DEBUG_LOCK_ALLOC
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index d24105b1b794..4dd6e4c219de 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * kernel/mutex.c 2 * kernel/locking/mutex.c
3 * 3 *
4 * Mutexes: blocking mutual exclusion locks 4 * Mutexes: blocking mutual exclusion locks
5 * 5 *