From patchwork Thu Jun 9 11:48:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 9166779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0D853604DB for ; Thu, 9 Jun 2016 11:49:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F017B2833F for ; Thu, 9 Jun 2016 11:49:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E2228341; Thu, 9 Jun 2016 11:49:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89F972833F for ; Thu, 9 Jun 2016 11:49:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA2986EB70; Thu, 9 Jun 2016 11:49:09 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BD886EB70 for ; Thu, 9 Jun 2016 11:49:08 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 09 Jun 2016 04:48:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,444,1459839600"; d="scan'208";a="972179725" Received: from jlahtine-desk.ger.corp.intel.com ([10.252.19.112]) by orsmga001.jf.intel.com with ESMTP; 09 Jun 2016 04:48:54 -0700 From: Joonas Lahtinen To: Linux kernel development Date: Thu, 9 Jun 2016 14:48:39 +0300 Message-Id: <1465472919-10499-1-git-send-email-joonas.lahtinen@linux.intel.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1455539446.5499.2.camel@linux.intel.com> References: <1455539446.5499.2.camel@linux.intel.com> Cc: "Gautham R. Shenoy" , trivial@kernel.org, Peter Zijlstra , intel-gfx@lists.freedesktop.org, Ingo Molnar Subject: [Intel-gfx] [PATCH] kernel/cpu: Distinct name for cpu_hotplug.dep_map X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Use distinctive name for cpu_hotplug.dep_map to avoid the actual cpu_hotplug.lock appearing as cpu_hotplug.lock#2 in lockdep splats. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Gautham R. Shenoy Cc: intel-gfx@lists.freedesktop.org Cc: trivial@kernel.org Acked-by: Gautham R. Shenoy Signed-off-by: Joonas Lahtinen Reviewed-by: Chris Wilson --- This time CC'ing trivial@kernel.org too in the hopes of finally getting this in. --- kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/cpu.c b/kernel/cpu.c index d948e44..d74199d 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -155,7 +155,7 @@ static struct { .wq = __WAIT_QUEUE_HEAD_INITIALIZER(cpu_hotplug.wq), .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock), #ifdef CONFIG_DEBUG_LOCK_ALLOC - .dep_map = {.name = "cpu_hotplug.lock" }, + .dep_map = STATIC_LOCKDEP_MAP_INIT("cpu_hotplug.dep_map", &cpu_hotplug.dep_map), #endif };