From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010Ab0AMXUU (ORCPT ); Wed, 13 Jan 2010 18:20:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753826Ab0AMXUN (ORCPT ); Wed, 13 Jan 2010 18:20:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36902 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189Ab0AMXUM (ORCPT ); Wed, 13 Jan 2010 18:20:12 -0500 Date: Wed, 13 Jan 2010 15:17:55 -0800 From: Greg KH To: Ingo Molnar Cc: Hitoshi Mitake , linux-kernel@vger.kernel.org, Peter Zijlstra , Paul Mackerras , Frederic Weisbecker Subject: Re: [PATCH 5/5] lockdep: Fix the way to initialize class_mutex for information of file and line Message-ID: <20100113231755.GA12325@suse.de> References: <4B45B9C1.2040900@dcl.info.waseda.ac.jp> <1262860795-5745-6-git-send-email-mitake@dcl.info.waseda.ac.jp> <20100113100022.GA11386@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100113100022.GA11386@elte.hu> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 13, 2010 at 11:00:22AM +0100, Ingo Molnar wrote: > > * Hitoshi Mitake wrote: > > > This patch adds __FILE__ and __LINE__ to arguments passed for > > __mutex_init() called in __class_register(). > > This affects to lockdep_map of class_mutex of struct class_private, > > and these will be used to make trace lock events more human friendly. > > > > Signed-off-by: Hitoshi Mitake > > Cc: Peter Zijlstra > > Cc: Paul Mackerras > > Cc: Frederic Weisbecker > > Cc: Greg Kroah-Hartman > > --- > > drivers/base/class.c | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/base/class.c b/drivers/base/class.c > > index 161746d..cc0630f 100644 > > --- a/drivers/base/class.c > > +++ b/drivers/base/class.c > > @@ -162,7 +162,8 @@ int __class_register(struct class *cls, struct lock_class_key *key) > > klist_init(&cp->class_devices, klist_class_dev_get, klist_class_dev_put); > > INIT_LIST_HEAD(&cp->class_interfaces); > > kset_init(&cp->class_dirs); > > - __mutex_init(&cp->class_mutex, "struct class mutex", key); > > + __mutex_init(&cp->class_mutex, "struct class mutex", key, > > + __FILE__, __LINE__); > > error = kobject_set_name(&cp->class_subsys.kobj, "%s", cls->name); > > if (error) { > > kfree(cp); > > Greg, any objection to this type of embellishment of lock data that comes from > the driver core? No, I'll queue it up in my tree. thanks, greg k-h