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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 6E235C56202 for ; Wed, 25 Nov 2020 20:14:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E27AB207BB for ; Wed, 25 Nov 2020 20:14:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BD9H88DG"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VyjQXeUD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E27AB207BB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cChl7TXz05QkI6dbEAf0NdddBndCSy2HX4TLTrqYIBc=; b=BD9H88DGfu1+9A6wzQ9UlDvUY sAr2c6ja5EPw2Iw+yYTO9rsSyu7BR/taksGzbGX+o1B7eIUWKojVIgoLLywJrc1DSeWnmO+enFBW6 qc5sWJUm38iHbvNXDw6bUFtkQPAxQ3twmD9NOWCPCQGQY6pxHZ7lTAxWVeZkoAaMd4mkAfBYu6vs+ auc1mMtMGR5ArIddZbBCRY6g3sRwOH7B3sY64Lqc7oDWDtLzCeaLPjBqJs54ZPzerHsrqaxd0zxaE fVAHAP94OGF6SN+Sg8fJEsxJVplIOSjJuI6IzoKbWK+F8jAj5N7nrfIu9IVu6T/i0aVi766/VSgQ+ Ms3Gkm+2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki19q-0003d9-Hd; Wed, 25 Nov 2020 20:12:54 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ki19n-0003cp-KL for linux-arm-kernel@lists.infradead.org; Wed, 25 Nov 2020 20:12:52 +0000 Received: by mail-wr1-x444.google.com with SMTP id r3so3167215wrt.2 for ; Wed, 25 Nov 2020 12:12:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bd7TNLRL/BDcofDOp2zwuHONXhhKrPSzdPi97VTB628=; b=VyjQXeUDKjyEnnM1Mh+13AHZWixDUhlzBY6lHWkbHPMXguGL6kf4OYZTDRckt6QtUK qWv/ncpAFKCe7eP66N5TGlW5vju7zJkbigivGkdiwNaqeV/gopSST2JhPp9Y8JfOxvH/ Lq1ZZRMmbTeVYZsKNPB8QFej5yV7pwko2IY+fvvntSHp3CGnAwcy29ytJoz6NvwEXp7K 2N95BksHPnv4GrRGqwZRWAhuSo3aib/5lx8IIflUjcEjiiXV50aJ19AcXX3m1BkN+9rZ isCKFgUdS4jslXYziW5nvaGyFtXOV08AJsHi8tnRCr6o3VYh/GbJP25Ywzq8UavRgkLJ cDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Bd7TNLRL/BDcofDOp2zwuHONXhhKrPSzdPi97VTB628=; b=XZ6qCcyetJ0Vs67nSu3XUwrbijeMJweRTkbNy3EAAMuJvUYK3pADBDE9wbu4f3OJp5 x9gQBpbHkwAuuSqkc3BzQskgwXxpQR7mqMaY93O219ax5CsjR77nd2Pft0jJI11pGJOF XF1V6Zzv+IJuGgywu+jUyJX222agAkrP7iyx5SJCi6y4ThAoB3TLU5umOohgueGs801a l5W+YtBjLRDxEeJK9JqXBIdqdA6AmiCkYHzpFEwX3vP+UXPBp/6Nty2CMl4sonZ/9q3D 3FZ9p8teFWdKMYXpYwgvHHziG3cZMRbcp42dN8FnK4LG3stgYoxsP5fkF3N7WNqkthhZ YEjQ== X-Gm-Message-State: AOAM530cT79RHWHxT6htzl8UWEN7zMudzc2HAPZH5RPABVYGmpt6qO1i VuoB2DIOBsb5CsZU6Cp2N90= X-Google-Smtp-Source: ABdhPJyeyZX1+zsB2AFTcN02MO1LwA3gafI1HtsOwl8uBa1dKJ9kCM0IVHqjmncx7OSnIHIfZcclRw== X-Received: by 2002:a5d:530d:: with SMTP id e13mr6134329wrv.92.1606335170564; Wed, 25 Nov 2020 12:12:50 -0800 (PST) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id w1sm5436278wmi.24.2020.11.25.12.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 12:12:49 -0800 (PST) From: Salvatore Bonaccorso To: stable@vger.kernel.org Subject: [PATCH 2/2] perf cs-etm: Move definition of 'traceid_list' global variable from header file Date: Wed, 25 Nov 2020 21:12:15 +0100 Message-Id: <20201125201215.26455-2-carnil@debian.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125201215.26455-1-carnil@debian.org> References: <20201122134339.GA6071@leoy-ThinkPad-X240s> <20201125201215.26455-1-carnil@debian.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_151251_751116_4909F921 X-CRM114-Status: GOOD ( 13.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Zhizhikin , Mark Rutland , Mathieu Poirier , Suzuki Poulouse , Alexander Shishkin , Tor Jeremiassen , Arnaldo Carvalho de Melo , Peter Zijlstra , Leo Yan , Namhyung Kim , Salvatore Bonaccorso , Jiri Olsa , Thomas Backlund , linux-arm-kernel@lists.infradead.org, Mike Leach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Leo Yan commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. The variable 'traceid_list' is defined in the header file cs-etm.h, if multiple C files include cs-etm.h the compiler might complaint for multiple definition of 'traceid_list'. To fix multiple definition error, move the definition of 'traceid_list' into cs-etm.c. Fixes: cd8bfd8c973e ("perf tools: Add processing of coresight metadata") Reported-by: Thomas Backlund Signed-off-by: Leo Yan Reviewed-by: Mathieu Poirier Reviewed-by: Mike Leach Tested-by: Mike Leach Tested-by: Thomas Backlund Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Suzuki Poulouse Cc: Tor Jeremiassen Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20200505133642.4756-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Salvatore Bonaccorso --- tools/perf/util/cs-etm.c | 3 +++ tools/perf/util/cs-etm.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 5cde3956e19a..3275b8dc9344 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -87,6 +87,9 @@ struct cs_etm_queue { struct cs_etm_packet *packet; }; +/* RB tree for quick conversion between traceID and metadata pointers */ +static struct intlist *traceid_list; + static int cs_etm__update_queues(struct cs_etm_auxtrace *etm); static int cs_etm__process_timeless_queues(struct cs_etm_auxtrace *etm, pid_t tid, u64 time_); diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h index fb5fc6538b7f..97c3152f5bfd 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -53,9 +53,6 @@ enum { CS_ETMV4_PRIV_MAX, }; -/* RB tree for quick conversion between traceID and metadata pointers */ -struct intlist *traceid_list; - #define KiB(x) ((x) * 1024) #define MiB(x) ((x) * 1024 * 1024) -- 2.29.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel