[git pull] core fixlet

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(-)

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 839d27c..5667c2f 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 bcdc9ac..12c779d 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.
*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Relevant Pages

  • Re: Is this kosher...
    ... calls for "mutexes that are statically allocated" (Open Group ... You're trying to initialize an auto ... mutex and then copy it to a dynamically-allocated mutex, ... into the data cache and it would sometimes not be visible to the ...
    (comp.programming.threads)
  • Re: Static-Initializer Failure Values...
    ... Dave Butenhof wrote: ... on a statically allocated and initialized mutex would fail. ... PTHREAD_MUTEX_INITIALIZER may actually fail to initialize the mutex ...
    (comp.programming.threads)
  • Re: Synchronizing processes in C#
    ... own for Process 2 to initialize. ... process 1 wait on a mutex, have process 2 acquire the mutex lock, do its ... initialization, then release the mutex, then process 1 resumes execution. ...
    (microsoft.public.dotnet.languages.csharp)
  • [PATCH] locking: fix mutex @key parameter kernel-doc notation
    ... This is used to create a struct class pointer that can then be used ... mutex_init - initialize the mutex ... Initialize the mutex to unlocked state. ...
    (Linux-Kernel)
  • Re: wayward system() call errors
    ... you'll want to statically initialize this ... is not safe if constructors of global objects try to log an error. ... If the mutex lock fails, ...
    (comp.unix.programmer)