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=-14.0 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, UNWANTED_LANGUAGE_BODY,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 76BBFC5519F for ; Fri, 20 Nov 2020 07:40:41 +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 87D2222256 for ; Fri, 20 Nov 2020 07:40:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BkUcU5z3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="krgs2Lso" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87D2222256 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: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:In-Reply-To:References:List-Owner; bh=/4uKjmeH9EsJOddcqG5jxIzeKQbEG5kwBtFdA6pV078=; b=BkUcU5z3jSS2D1uUwXErtlAIdP YKxfiuc9NxduR1vwTaamX0RuIHFOTamB9PFcqZeyZE8hiAIGHre2fj1KdZW3FrU3Nhwbrl43ce46R xhVJ2lfN4DyKAXjH+EoQYWK/Aex8rxNLPD9cts2SQ0aDgr0FcFDluyXffkUxoOfcrvK7mWfLyYX+d FP3GsGbON7eW63Yr3Xr65fnokBayw/b2fUKAfxmDbU8HbaIttf+GwzdnNqVr83X+F+4twUxHzyBNF A8fuARGZnzK4js0aSXpshwodVT2uFH1dHnnGpX4eiE/Y0JL/kkbJINH2SlQYoMG7LwAB1LktuTGKy yjhzwGqQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg10t-0006pg-JE; Fri, 20 Nov 2020 07:39:23 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kg10m-0006ld-If for linux-arm-kernel@lists.infradead.org; Fri, 20 Nov 2020 07:39:21 +0000 Received: by mail-wm1-x343.google.com with SMTP id a186so6631519wme.1 for ; Thu, 19 Nov 2020 23:39:15 -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:mime-version :content-transfer-encoding; bh=jfPTCOwEycreCjYHBBr08e6mFViZKX3r3jGlSQp0SCM=; b=krgs2Lsoh7RjFNQY+PLvHqwiP8nZIucSU4Eav6GiCCibRsY8YnLX19F4vIDVhUhLK8 pjTu0gSbskWpoGGWWmLXiu3EwMetCxsZ26Xinb6BOMxMAKEH6E0NduKsAsEF0lkLSVkq 51ymkjX2Sm4d/xOsXYAacFG7HMiLZfnlyB/nbyUJiA8ZCU4JtjGCU8IclnUpl6ysUqfv ggFZ1lMFkWapn797gHmzvgO0VE/SPPXrO1BBkK4DeDcSlfSRUDZSmPbEDpgYW7bnnDlK O1Mn8kqK2lHI3+IcNSPqeo+BtrR/chCxvsKGAeE4tKAmKglUsohG/FOzp+Dw3TmtSnsc bmxA== 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 :mime-version:content-transfer-encoding; bh=jfPTCOwEycreCjYHBBr08e6mFViZKX3r3jGlSQp0SCM=; b=H3aa1wnhMwRbc5we4DLaRNp7a2f5cLDgHewkNhXqYdd5BwVOt4/KbS3NbXN4e2AoVF msfeDbB2w+ZUNQA9V8BfhLGDVwIWkrklY/1EqsOD3fqRyUfU87ru8eKh4Jysyw+UaNbs yvOHUBQHXqGBem6RnI4m9bFV98k9q8aXa+GIbshBpcBVhNvHh7UhjZuOxqSmHgSHV73y OxXNnLks9Vd5snnvQweZBIuNc6qE0Z/RlY9Pivyz4/ZW07eFLs+5crdqvmfAm+/AvRa0 Izo2Paqk4Ittqhx+tzFGM+p11+Q1Fkl/PyUngGxRS+fj+BuhpHlTILCIbKTJWvWdbojD dxwQ== X-Gm-Message-State: AOAM530jUExyUqd/hT4my79uJ5jBac7+rtLgpcd+udGT3obqI0JQYF3w CmWH7FIVnJITrWYBVVY5wET5PAgdpm2m+g== X-Google-Smtp-Source: ABdhPJy3YFEsdBxnFeV3EQVQAUdhD1rIxsZfmvY0J96aur/Ses7s+2mmCcCsSzU9BBjma9A18RWtLA== X-Received: by 2002:a1c:c309:: with SMTP id t9mr1256803wmf.149.1605857954556; Thu, 19 Nov 2020 23:39:14 -0800 (PST) Received: from eldamar (80-218-24-251.dclient.hispeed.ch. [80.218.24.251]) by smtp.gmail.com with ESMTPSA id q12sm3854196wrx.86.2020.11.19.23.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:39:12 -0800 (PST) From: Salvatore Bonaccorso To: stable@vger.kernel.org Subject: [PATCH] Revert "perf cs-etm: Move definition of 'traceid_list' global variable from header file" Date: Fri, 20 Nov 2020 08:39:09 +0100 Message-Id: <20201120073909.357536-1-carnil@debian.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201120_023916_678535_0AE28821 X-CRM114-Status: GOOD ( 15.75 ) 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: Mark Rutland , Suzuki Poulouse , Alexander Shishkin , Greg Kroah-Hartman , Tor Jeremiassen , Arnaldo Carvalho de Melo , Peter Zijlstra , Guenter Roeck , Leo Yan , Namhyung Kim , Jiri Olsa , linux-arm-kernel@lists.infradead.org, Salvatore Bonaccorso 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 This reverts commit 168200b6d6ea0cb5765943ec5da5b8149701f36a upstream. (but only from 4.19.y) The original commit introduces a build failure as seen on Debian buster when compiled with gcc (Debian 8.3.0-6) 8.3.0: $ LC_ALL=C.UTF-8 ARCH=x86 make perf [...] Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h' CC util/cs-etm-decoder/cs-etm-decoder.o CC util/intel-pt.o util/cs-etm-decoder/cs-etm-decoder.c: In function 'cs_etm_decoder__buffer_packet': util/cs-etm-decoder/cs-etm-decoder.c:287:24: error: 'traceid_list' undeclared (first use in this function); did you mean 'trace_event'? inode = intlist__find(traceid_list, trace_chan_id); ^~~~~~~~~~~~ trace_event util/cs-etm-decoder/cs-etm-decoder.c:287:24: note: each undeclared identifier is reported only once for each function it appears in make[6]: *** [/build/linux-stable/tools/build/Makefile.build:97: util/cs-etm-decoder/cs-etm-decoder.o] Error 1 make[5]: *** [/build/linux-stable/tools/build/Makefile.build:139: cs-etm-decoder] Error 2 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/build/linux-stable/tools/build/Makefile.build:139: util] Error 2 make[3]: *** [Makefile.perf:633: libperf-in.o] Error 2 make[2]: *** [Makefile.perf:206: sub-make] Error 2 make[1]: *** [Makefile:70: all] Error 2 make: *** [Makefile:77: perf] Error 2 Link: https://lore.kernel.org/stable/20201114083501.GA468764@eldamar.lan/ Cc: Leo Yan 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 Cc: Arnaldo Carvalho de Melo Cc: Guenter Roeck Cc: Greg Kroah-Hartman Cc: # 4.19.y 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 ad33b99f5d21..7b5e15cc6b71 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -87,9 +87,6 @@ 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 c7ef97b198c7..37f8d48179ca 100644 --- a/tools/perf/util/cs-etm.h +++ b/tools/perf/util/cs-etm.h @@ -53,6 +53,9 @@ enum { CS_ETMV4_PRIV_MAX, }; +/* RB tree for quick conversion between traceID and CPUs */ +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