Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751889AbaBKLAr (ORCPT ); Tue, 11 Feb 2014 06:00:47 -0500 Received: from merlin.infradead.org ([205.233.59.134]:50622 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbaBKLAl (ORCPT ); Tue, 11 Feb 2014 06:00:41 -0500 Date: Tue, 11 Feb 2014 12:00:36 +0100 From: Peter Zijlstra To: Tejun Heo Cc: Tommi Rantala , Ingo Molnar , LKML , Dave Jones , trinity@vger.kernel.org Subject: Re: lockdep: strange %s#5 lock name Message-ID: <20140211110036.GT9987@twins.programming.kicks-ass.net> References: <20140210192846.GF27965@twins.programming.kicks-ass.net> <20140210215224.GB25350@mtj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140210215224.GB25350@mtj.dyndns.org> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > Looks good to me. Can you please post the patch with SOB? --- Subject: workqueue: Fix workqueue lockdep name Tommi noticed a 'funny' lock class name: "%s#5" from a lock acquired in process_one_work(). It turns out that commit b196be89cdc14 forgot to change the lockdep_init_map() when it changed the @lock_name argument from a string to a format. Fixes: b196be89cdc14 ("workqueue: make alloc_workqueue() take printf fmt and args for name") Reported-by: Tommi Rantala Signed-off-by: Peter Zijlstra --- diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 82ef9f3b7473..861d8ddd92a2 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4202,7 +4202,7 @@ struct workqueue_struct *__alloc_workqueue_key(const char *fmt, INIT_LIST_HEAD(&wq->flusher_overflow); INIT_LIST_HEAD(&wq->maydays); - lockdep_init_map(&wq->lockdep_map, lock_name, key, 0); + lockdep_init_map(&wq->lockdep_map, wq->name, key, 0); INIT_LIST_HEAD(&wq->list); if (alloc_and_link_pwqs(wq) < 0) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/