From patchwork Sun Dec 27 09:27:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salvatore Bonaccorso X-Patchwork-Id: 352537 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp8930033jai; Sun, 27 Dec 2020 01:30:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJwE2AbOkdOipOV0Jo3prtspb4pHBL2jewMvubib8ARB3n2lLjtBj5EemcN2ctESRC+wTRE8 X-Received: by 2002:a17:907:546:: with SMTP id wk6mr36938381ejb.238.1609061403450; Sun, 27 Dec 2020 01:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609061403; cv=none; d=google.com; s=arc-20160816; b=x09nqzmVG0l60ZkIFCtti+q5fgRpOpJHRN7n3FudvUipLvyeZI1zb9XEHYIECMJLe6 JFMO77RQLW1uMKF3b0JPgykknbkU9Eyo0IY/xwlcGVfysuoL8p3kihKcrfIj9yu6S43r x0ykML3fiX6y5ZJEI+5ejs4Soqs5MCZgtqt1g51W23f1L4HCtMCnVcUVlLiFg560pSI5 13GlnARvhS8t5PuBAMJPxjZPgH1zUinLwoQeHhi7etu0r/xq3OVkq4BTrYtl7IhYPUTH j1gaSwk8zmHEUIMehNpu9MUL+VEGifRGiQK5PFD2UAYkUKK24fpYmS0WAAhKN0TWT3CI tTCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=b3XfiZGTmdtILp+unm6rSSuThTHGpNqTBR1owWhke04=; b=q/PO/FkIUBeDWwK75dGRTisY/ZcU0TBKPz913/EYO4b+z//k4clpvnIk2offH03XfJ jR+z7Pky3PwfwlxUQuui174ScQN5N160RMW5z3HkijRg4BtcvfkWEEoLDuKLCCouaN2E i4sEZNN19W33hIs7wg8YdD0BJRCCHjbzFQlryx4kkRt8AWuxvJ16JMVN+CQ3EzVZ7Auo EQj6IaIVsv8KWavf4S7UZa69Upu01FvQOYRO+9ISpwYYl7g2jIAb7EFEpQtTHKCr8dmn GcXR7zHWVuU126no0QjdnZXPN3qQP/67R8sRIXNOY24IyJS1xrDkZv75xerNPAkbch2E 1nTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=G0s73267; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j15si19497269edv.474.2020.12.27.01.30.03; Sun, 27 Dec 2020 01:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=G0s73267; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726117AbgL0J32 (ORCPT + 14 others); Sun, 27 Dec 2020 04:29:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726019AbgL0J31 (ORCPT ); Sun, 27 Dec 2020 04:29:27 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93A63C061794 for ; Sun, 27 Dec 2020 01:28:46 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id g20so10749257ejb.1 for ; Sun, 27 Dec 2020 01:28:46 -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=b3XfiZGTmdtILp+unm6rSSuThTHGpNqTBR1owWhke04=; b=G0s73267c0w0axAQajWTEYK2o7gF7BNjzv4WbWX6fD13vVy3UMCkFVEv5EErPCY+so R6VY3PeLQcQs1GoIKMHgEih9fGp5qQAnVZR3XFvCdMCFFFXrrBLNty7zm1f/8zIXReTX H1/NLhmUV/lIQ27UfD+oO+3KatCWg6NOiA5I/NMh5p+FmOO+xKqGxDaMnvf+vBUwNCsP CmdxMHdx3II2YmoDlt7PaKiYmwa20Nxwk+UR+5XcB9Uli70SvvENmGxed+UTJhiik64I ybD/LZhymP6TD+QogBUPyjb0Yzu3dEU4HJDVweE0XApm5Ju/VwuDE+H/fTaoa0tPvbtx aILQ== 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=b3XfiZGTmdtILp+unm6rSSuThTHGpNqTBR1owWhke04=; b=jl5lu3ttsHNBoRk96C1RR5ooze9awtlsVxhamom/8GyjeqiTZUQaamvahzq0mMF/kS HV8LxtC4iFBz6reKz1Rkcz8dGcjTQISTXpMsfJVFz2cB9nAWGHH1gCcu1I+Yua/xvb7e Ebj+qRZDuvjHZh2wRwpcAeCsHa6hk/cOXdQYbSVamcUu92XsgPGc4/6KGS3mtmFlyIDP NOgM2fXHPCYc4B+QXDeOmYyc1AuONA0v3EDleYCr/JMw1+jVBb0NvshnKTrI3eRLg2/E 3O2ImhbHSSf+WBKznHgN4JDZ3zhvi+LMg7BaUrWa+PRm/RcZFb+JxH+Uzn4/vGK+bnjv HJAw== X-Gm-Message-State: AOAM531lE/MYB/yZbpqszrBRmQRgysKQyFy9XAKChjydol782zF2h+QA 8ca8iE0MnNYsQFa3oRZFPfA= X-Received: by 2002:a17:906:705:: with SMTP id y5mr36419497ejb.428.1609061325403; Sun, 27 Dec 2020 01:28:45 -0800 (PST) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id c16sm9905934ejk.91.2020.12.27.01.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Dec 2020 01:28:44 -0800 (PST) Sender: Salvatore Bonaccorso From: Salvatore Bonaccorso To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sasha Levin , Leo Yan , Thomas Backlund , Mathieu Poirier , Mike Leach , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Suzuki Poulouse , Tor Jeremiassen , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Salvatore Bonaccorso Subject: [PATCH 2/2] perf cs-etm: Move definition of 'traceid_list' global variable from header file Date: Sun, 27 Dec 2020 10:27:45 +0100 Message-Id: <20201227092745.447945-3-carnil@debian.org> X-Mailer: git-send-email 2.30.0.rc2 In-Reply-To: <20201227092745.447945-1-carnil@debian.org> References: <20201227092745.447945-1-carnil@debian.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.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(-) -- 2.30.0.rc2 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)