Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5adf2b03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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
parents e811603f 0e241ffd

drivers/base/class.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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.

 *