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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 0A40AC433E0 for ; Thu, 28 May 2020 09:05:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB5FD2145D for ; Thu, 28 May 2020 09:05:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="IonMW0yP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728077AbgE1JFE (ORCPT ); Thu, 28 May 2020 05:05:04 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:42961 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728028AbgE1JFD (ORCPT ); Thu, 28 May 2020 05:05:03 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49Xhbx5gPCz9sSF; Thu, 28 May 2020 19:05:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1590656701; bh=hFZCXpwyF+voqr0buEwSw32UU9jdGOvmsOlYam8KpIM=; h=Date:From:To:Cc:Subject:From; b=IonMW0yPWVEYu1nwvMMNlAhhFEBeUZ79eHQa7qhUgaZMDOJ0VYDmkSwkq5xaqnO/1 dDI/VI3vQ3dXIMF//oEzTHIqShjv3Z8+mXrDGbKtQepYRTR/KNOoZ9MLoTZaXuaiaA usopWvlmbN1xH9TmzKPKwQ9GwiaIjVyDlEdzA6v7s0+HcTWpmArWZ7wOFzElmVbhid 2lbySI0se/Db+1bXGGTyaEDheJ1ATTU2TMQUQgTt7C4Bpe9KT/pvyTrkEMoOuHHlFd unWfUpMRUocTarfpHSgsAOcuVpxwH9C2Ak8PaOnFlpY6Hlpj3tIjvyrQNTo9ZATqjv AjIEQ2WB/InjA== Date: Thu, 28 May 2020 19:05:01 +1000 From: Stephen Rothwell To: "Paul E. McKenney" Cc: Linux Next Mailing List , Linux Kernel Mailing List , "Joel Fernandes (Google)" Subject: linux-next: build failure after merge of the rcu tree Message-ID: <20200528190501.10135e9f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/3kczfIxexzGb0HAvK.fAKWI"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/3kczfIxexzGb0HAvK.fAKWI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the rcu tree, today's linux-next build (powercp allyesconfig) failed like this: ld: kernel/rcu/refperf.o:(.discard+0x0): multiple definition of `__pcpu_uni= que_srcu_ctl_perf_srcu_data'; kernel/rcu/rcuperf.o:(.discard+0x0): first de= fined here Caused by commit 786a25497743 ("refperf: Add a test to measure performance of read-side sy= nchronization") =46rom srcutree.h: * Note that although DEFINE_STATIC_SRCU() hides the name from other * files, the per-CPU variable rules nevertheless require that the * chosen name be globally unique. I have applied the following patch for today. From: Stephen Rothwell Date: Thu, 28 May 2020 18:57:17 +1000 Subject: [PATCH] refperf: uniqify name Signed-off-by: Stephen Rothwell --- kernel/rcu/refperf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/rcu/refperf.c b/kernel/rcu/refperf.c index 8c4a63257be9..47df72c492b3 100644 --- a/kernel/rcu/refperf.c +++ b/kernel/rcu/refperf.c @@ -133,8 +133,8 @@ static struct ref_perf_ops rcu_ops =3D { =20 =20 // Definitions for SRCU ref perf testing. -DEFINE_STATIC_SRCU(srcu_ctl_perf); -static struct srcu_struct *srcu_ctlp =3D &srcu_ctl_perf; +DEFINE_STATIC_SRCU(ref_srcu_ctl_perf); +static struct srcu_struct *srcu_ctlp =3D &ref_srcu_ctl_perf; =20 static void srcu_ref_perf_read_section(int nloops) { --=20 2.26.2 --=20 Cheers, Stephen Rothwell --Sig_/3kczfIxexzGb0HAvK.fAKWI Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7Pfr0ACgkQAVBC80lX 0GzeoAf9HZs3neZGaTiBsG7YqSByje0kTcGIY4ABqQIzts4GrpSRKAPMJMjcgbhm abwLJYbCJDwYBKWEeBRr+QINOvf5wGNseCuzPhQTl+eLcJl9TcRDu8VA3gDH3JKr SnGy/S8qydZ0LpbMS912g4c86ruPsg3JB5/Y7HvvoGLxWFfu0EC8tPv460ZV+f6f 4s1NSOMB5Cz0fUYFwBFkXpMuiNq3XSy//hH/rrTUA4q6ypIFzHzRttSdKqjLMhO2 2dbohP/uDaFkco+zvnNmmgbvkavbfh2ZFW7QaRYaZ8XhEAEvRXlOB9xBJNrLdwv9 DSpRwJTwWpm87oivgmybYAjfr3beSg== =D0aF -----END PGP SIGNATURE----- --Sig_/3kczfIxexzGb0HAvK.fAKWI--