summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:52:39 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-01 11:52:39 -0700
commit5adf2b03d97111c8955495ba11e8b7db27df8695 (patch)
tree6e02833c57f4967973ebe14b44ce30ddd85f1ea2 /kernel
parente811603feb198079bcdb3f75f72cbf9681de2062 (diff)
parent0e241ffd306c0896bb9959be7faa4d4cfcb706d9 (diff)
downloadop-kernel-dev-5adf2b03d97111c8955495ba11e8b7db27df8695.zip
op-kernel-dev-5adf2b03d97111c8955495ba11e8b7db27df8695.tar.gz
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: fix mutex @key parameter kernel-doc notation
Diffstat (limited to 'kernel')
-rw-r--r--kernel/mutex.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index bcdc9ac..12c779d 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -34,6 +34,7 @@
/***
* mutex_init - initialize the mutex
* @lock: the mutex to be initialized
+ * @key: the lock_class_key for the class; used by mutex lock debugging
*
* Initialize the mutex to unlocked state.
*
OpenPOWER on IntegriCloud