Skip to contentSkip to conversation

core fixlet

GIT PULL Ingo Molnar 1 participant 1 message Jul 31, 2008 Driver core

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus

(the drivers/base/class.c bit has an ack from Greg.)

Thanks,

Ingo

------------------>
Randy Dunlap (1):
locking: fix mutex @key parameter kernel-doc notation

 drivers/base/class.c |    1 +
 kernel/mutex.c       |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/base/class.c +1 -0
index 839d27c..5667c2f 100644
@@ -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().
kernel/mutex.c +1 -0
index bcdc9ac..12c779d 100644
@@ -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.
  *