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=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 F295EC43381 for ; Sat, 9 Mar 2019 14:45:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBA032087C for ; Sat, 9 Mar 2019 14:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726504AbfCIOpt (ORCPT ); Sat, 9 Mar 2019 09:45:49 -0500 Received: from terminus.zytor.com ([198.137.202.136]:40249 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725841AbfCIOpt (ORCPT ); Sat, 9 Mar 2019 09:45:49 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x29Ef1pt3109520 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 9 Mar 2019 06:41:01 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x29Eex8O3109515; Sat, 9 Mar 2019 06:40:59 -0800 Date: Sat, 9 Mar 2019 06:40:59 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Arnd Bergmann Message-ID: Cc: torvalds@linux-foundation.org, riel@surriel.com, tglx@linutronix.de, dave.hansen@linux.intel.com, longman@redhat.com, arnd@arndb.de, eranian@google.com, penguin-kernel@I-love.SAKURA.ne.jp, acme@redhat.com, peterz@infradead.org, hpa@zytor.com, vincent.weaver@maine.edu, akpm@linux-foundation.org, luto@kernel.org, frederic@kernel.org, jolsa@redhat.com, bvanassche@acm.org, joel@joelfernandes.org, will.deacon@arm.com, alexander.shishkin@linux.intel.com, paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, bp@alien8.de, mingo@kernel.org Reply-To: hpa@zytor.com, akpm@linux-foundation.org, vincent.weaver@maine.edu, frederic@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, longman@redhat.com, dave.hansen@linux.intel.com, tglx@linutronix.de, riel@surriel.com, peterz@infradead.org, acme@redhat.com, penguin-kernel@I-love.SAKURA.ne.jp, arnd@arndb.de, eranian@google.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, mingo@kernel.org, bp@alien8.de, bvanassche@acm.org, jolsa@redhat.com, will.deacon@arm.com, joel@joelfernandes.org, paulmck@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com In-Reply-To: <20190307075222.3424524-1-arnd@arndb.de> References: <20190307075222.3424524-1-arnd@arndb.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/urgent] locking/lockdep: Avoid a Clang warning Git-Commit-ID: 3fe7522fb766f6ee76bf7bc2837f1e3cc52c4e27 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3fe7522fb766f6ee76bf7bc2837f1e3cc52c4e27 Gitweb: https://git.kernel.org/tip/3fe7522fb766f6ee76bf7bc2837f1e3cc52c4e27 Author: Arnd Bergmann AuthorDate: Thu, 7 Mar 2019 08:52:12 +0100 Committer: Ingo Molnar CommitDate: Sat, 9 Mar 2019 14:15:51 +0100 locking/lockdep: Avoid a Clang warning Clang warns about a tentative array definition without a length: kernel/locking/lockdep.c:845:12: error: tentative array definition assumed to have one element [-Werror] There is no real reason to do this here, so just set the same length as in the real definition later in the same file. It has to be hidden in an #ifdef or annotated __maybe_unused though, to avoid the unused-variable warning if CONFIG_PROVE_LOCKING is disabled. Signed-off-by: Arnd Bergmann Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Andrew Morton Cc: Andy Lutomirski Cc: Arnaldo Carvalho de Melo Cc: Bart Van Assche Cc: Borislav Petkov Cc: Dave Hansen Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Jiri Olsa Cc: Joel Fernandes (Google) Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: Stephane Eranian Cc: Steven Rostedt (VMware) Cc: Tetsuo Handa Cc: Thomas Gleixner Cc: Vince Weaver Cc: Waiman Long Cc: Will Deacon Link: https://lkml.kernel.org/r/20190307075222.3424524-1-arnd@arndb.de Signed-off-by: Ingo Molnar --- kernel/locking/lockdep.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 21cb81fe6359..35a144dfddf5 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -842,7 +842,9 @@ static bool class_lock_list_valid(struct lock_class *c, struct list_head *h) return true; } -static u16 chain_hlocks[]; +#ifdef CONFIG_PROVE_LOCKING +static u16 chain_hlocks[MAX_LOCKDEP_CHAIN_HLOCKS]; +#endif static bool check_lock_chain_key(struct lock_chain *chain) {