From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14531C433FF for ; Mon, 29 Jul 2019 19:44:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDC96217D9 for ; Mon, 29 Jul 2019 19:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429442; bh=rkS9jAr5xbZv1Y6w7MuAJaQu3AhAQDt7cEO3t9brTQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2vh9OrJopeGpuQCcUEmJk7dy+A5mkBzMUqoKetnGokucYfXx5KCTSCNa6hPtcO1Q9 qVy3TAZ2xzP+P1lMSnW1JIJTQBhF3D+/zQYsMu+Y03dacslqYAE4c44aV2YeaYMMCq 9nr3gjPDRDzu58QzdMbi0A1kuYgGep+w45t7a3BQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389703AbfG2ToA (ORCPT ); Mon, 29 Jul 2019 15:44:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:60594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389725AbfG2Tn6 (ORCPT ); Mon, 29 Jul 2019 15:43:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0363B2054F; Mon, 29 Jul 2019 19:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429437; bh=rkS9jAr5xbZv1Y6w7MuAJaQu3AhAQDt7cEO3t9brTQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EpSsFCvtnhYmYuktXLBfzcwIx8CPOgaI+/geTscqzyTtlhXfpu5sGujGyBF3uY+a2 Vs29IyTMCRHDahNubcUWTlmD0w5wAHssYPy7UBDxkBVze6jBBpLcZ38heMUCMgx/Mu B/k3HJocXUo3bJzVhScQ80N0Xl6TbcMmQgyNSAm8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "Peter Zijlstra (Intel)" , Andrew Morton , Bart Van Assche , Linus Torvalds , "Paul E. McKenney" , Qian Cai , Thomas Gleixner , Waiman Long , Will Deacon , Will Deacon , Yuyang Du , frederic@kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.19 097/113] locking/lockdep: Hide unused class variable Date: Mon, 29 Jul 2019 21:23:04 +0200 Message-Id: <20190729190718.722179820@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190655.455345569@linuxfoundation.org> References: <20190729190655.455345569@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 68037aa78208f34bda4e5cd76c357f718b838cbb ] The usage is now hidden in an #ifdef, so we need to move the variable itself in there as well to avoid this warning: kernel/locking/lockdep_proc.c:203:21: error: unused variable 'class' [-Werror,-Wunused-variable] Signed-off-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Cc: Andrew Morton Cc: Bart Van Assche Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Qian Cai Cc: Thomas Gleixner Cc: Waiman Long Cc: Will Deacon Cc: Will Deacon Cc: Yuyang Du Cc: frederic@kernel.org Fixes: 68d41d8c94a3 ("locking/lockdep: Fix lock used or unused stats error") Link: https://lkml.kernel.org/r/20190715092809.736834-1-arnd@arndb.de Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/locking/lockdep_proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index 6cf288eef670..6fcc4650f0c4 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -200,7 +200,6 @@ static void lockdep_stats_debug_show(struct seq_file *m) static int lockdep_stats_show(struct seq_file *m, void *v) { - struct lock_class *class; unsigned long nr_unused = 0, nr_uncategorized = 0, nr_irq_safe = 0, nr_irq_unsafe = 0, nr_softirq_safe = 0, nr_softirq_unsafe = 0, @@ -211,6 +210,8 @@ static int lockdep_stats_show(struct seq_file *m, void *v) sum_forward_deps = 0; #ifdef CONFIG_PROVE_LOCKING + struct lock_class *class; + list_for_each_entry(class, &all_lock_classes, lock_entry) { if (class->usage_mask == 0) -- 2.20.1