Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* '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

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 839d27cecb36c8acb3bf8e9e4880ba720e6fe53b..5667c2f02c51b2249fdac0d69fc7fd0a8fe4dfd0 100644 (file)
--- 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 bcdc9ac8ef60da5a2937ce8205e58ab2a2350deb..12c779dc65d48a56f1941cc41d73f9593828cf0a 100644 (file)
--- 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.
  *