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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B53F6C433F5 for ; Mon, 30 May 2022 21:54:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241037AbiE3VyY (ORCPT ); Mon, 30 May 2022 17:54:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242036AbiE3VyP (ORCPT ); Mon, 30 May 2022 17:54:15 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D5C656C08 for ; Mon, 30 May 2022 14:54:14 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id r65so10302363oia.9 for ; Mon, 30 May 2022 14:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=17BwL5DwmppT0Sezwf7O5p29EgWkqlCPCTI9oepOQ+I=; b=JxzThJZoc9ZJQp7kd6N2gSoBo/hvqH6btv+Ik9c+8HnYKALsc7XG4IJ9c+57xEdGV9 +3yAY6z4w4TH8oTFlOEPOkNciGNuE9qZ/mG5gJovav05ag7Nc0QF+uoUlUfrF8vVuMBY b7Wyg9luPjun1Ehe75UlRgKcKq///saQQCOX445J6+OlbjaUsVZRt/BGUa76UNNGn2cm W+PrX7EVIti7F2bCwyWAMeQ3m/nggjlaUGXO5bI+rk9zmoQ9CQw/d/R8/vD+F43Q1rSi vIjX/rznJ255ehAfIBzZTKmkkQqjtH1YOHa0EL8iHh9XTcFyVALQUkDRUnoBv1DHLUjo UL6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=17BwL5DwmppT0Sezwf7O5p29EgWkqlCPCTI9oepOQ+I=; b=dc1ho7ksmS3VDPvmqaTNIrd5YexzZ4+V6FDB1v4camOVoM+V3/XB6iKgMk7i15oSvv cLk3HqGxbjSHNrf8uRJ+DDT5Fe3zwGPK59ajAZj3mCTm78pLZxyMf0TkiUOLq3a/BvmA NqC7mljOAY2/npGvkYPxnxgZ5G3cIiv3CRM8Oyhb8whoJiIKlTqcf5mXudNIL1lhwrD1 jQjZsJvjoWfs0jUiJkowrtqV/LnLNbbHTQATWbnxJ9OeqSK3uMFIsRRnjDTLrUN5BPtq 8mVjJMJhqJd9UoUdkzplHI+R+iXMJCz6t6Sa6/XtiEPA52kdNw8ExQRmNiMoSU4HCE9/ 9Yzw== X-Gm-Message-State: AOAM532H3kjOssNioHe3kl31cT8fj3Suig/v+r/XxXBHd0+kxs3AxQ1r qhNq3hAS8XpeiZH0qIwch6qXBw== X-Google-Smtp-Source: ABdhPJxGAD0IWWAM266hIaw7gTeIhiTsPBvLhEIDtPYwuk57m/PuwzCDG9ZJ7Y0PbT1Tj+mWEFJSVw== X-Received: by 2002:a05:6808:2125:b0:32b:1ba0:8b05 with SMTP id r37-20020a056808212500b0032b1ba08b05mr10578897oiw.20.1653947652699; Mon, 30 May 2022 14:54:12 -0700 (PDT) Received: from alago.cortijodelrio.net ([189.219.75.147]) by smtp.googlemail.com with ESMTPSA id fq11-20020a0568710b0b00b000f23989c532sm4230425oab.8.2022.05.30.14.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 14:54:12 -0700 (PDT) From: =?UTF-8?q?Daniel=20D=C3=ADaz?= To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Cc: Arnaldo Carvalho de Melo , Jiri Olsa , Adrian Hunter , Namhyung Kim , =?UTF-8?q?Daniel=20D=C3=ADaz?= , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , linux-kernel@vger.kernel.org (open list:PERFORMANCE EVENTS SUBSYSTEM) Subject: [PATCH 4.19 3/3] perf tests bp_account: Make global variable static Date: Mon, 30 May 2022 16:53:25 -0500 Message-Id: <20220530215325.921847-4-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220530215325.921847-1-daniel.diaz@linaro.org> References: <20220530215325.921847-1-daniel.diaz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo [ Upstream commit cff20b3151ccab690715cb6cf0f5da5cccb32adf ] To fix the build with newer gccs, that without this patch exit with: LD /tmp/build/perf/tests/perf-in.o ld: /tmp/build/perf/tests/bp_account.o:/git/perf/tools/perf/tests/bp_account.c:22: multiple definition of `the_var'; /tmp/build/perf/tests/bp_signal.o:/git/perf/tools/perf/tests/bp_signal.c:38: first defined here make[4]: *** [/git/perf/tools/build/Makefile.build:145: /tmp/build/perf/tests/perf-in.o] Error 1 First noticed in fedora:rawhide/32 with: [perfbuilder@a5ff49d6e6e4 ~]$ gcc --version gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8) Reported-by: Jiri Olsa Cc: Adrian Hunter Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Daniel Díaz --- tools/perf/tests/bp_account.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c index a20cbc4454269..624e4ef73d1c0 100644 --- a/tools/perf/tests/bp_account.c +++ b/tools/perf/tests/bp_account.c @@ -22,7 +22,7 @@ #include "perf.h" #include "cloexec.h" -volatile long the_var; +static volatile long the_var; static noinline int test_function(void) { -- 2.32.0