diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 11:52:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 11:52:39 -0700 |
| commit | 5adf2b03d97111c8955495ba11e8b7db27df8695 (patch) | |
| tree | 6e02833c57f4967973ebe14b44ce30ddd85f1ea2 | |
| parent | e811603feb198079bcdb3f75f72cbf9681de2062 (diff) | |
| parent | 0e241ffd306c0896bb9959be7faa4d4cfcb706d9 (diff) | |
| download | linux-5adf2b03d97111c8955495ba11e8b7db27df8695.tar.gz linux-5adf2b03d97111c8955495ba11e8b7db27df8695.tar.bz2 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
| -rw-r--r-- | drivers/base/class.c | 1 | ||||
| -rw-r--r-- | kernel/mutex.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c index 839d27cecb36..5667c2f02c51 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c @@ -198,6 +198,7 @@ static void class_create_release(struct class *cls) * class_create - create a struct class structure * @owner: pointer to the module that is to "own" this struct class * @name: pointer to a string for the name of this class. + * @key: the lock_class_key for this class; used by mutex lock debugging * * This is used to create a struct class pointer that can then be used * in calls to device_create(). 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. * |