diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 20:52:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 20:52:39 +0200 |
| commit | 5adf2b03d97111c8955495ba11e8b7db27df8695 (patch) | |
| tree | 6e02833c57f4967973ebe14b44ce30ddd85f1ea2 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | locking: fix mutex @key parameter kernel-doc notation (diff) | |
| download | linux-5adf2b03d97111c8955495ba11e8b7db27df8695.tar.xz linux-5adf2b03d97111c8955495ba11e8b7db27df8695.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index bcdc9ac8ef60..12c779dc65d4 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. * |