Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp648168ybz; Wed, 22 Apr 2020 05:27:08 -0700 (PDT) X-Google-Smtp-Source: APiQypLgbo+SdriaAZK5mhlPE5bZO+sZp5Gr2Mz4xVh3tgcbyNgEA4ZRnEf/kZD1ZVaOPpTMx8kP X-Received: by 2002:a17:906:b2c2:: with SMTP id cf2mr24945764ejb.262.1587558428757; Wed, 22 Apr 2020 05:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587558428; cv=none; d=google.com; s=arc-20160816; b=uwOg2m7d4dNvJcloPGbQn2Tpay+wBM2e1TfaWW1ASdFfuVn+P1g0obrtf1C5GeTQ9H hh7XkQ29XTtATD3EIXuOdACPOFgq07NLF8MC4Rc2LWrEE8Cae5dV0+gtQE4x+VhZqYso ABw1IXvw4aXW+9tvYg0bDzuNaQHEFNXCA6fFWTYKGJOskJJPhJmQVNHeSyg3bMY8bPhc vX47pknX6R73iQeyNmj/hQJ7aqDrj1VL4wtHhKsx8oGVDvYovXx7mtyEEi2+i4MMz/sv lY3I0h3shPZVkataBxvaIsFyv0y5T4tgbuMBRhYEIrHyDU4xj/LxPQb2oCyM5iv9TY2P gKEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=wFSGDwcpQEEqXjnLCa1G/V/VThtO05tKmAqhiB+1cPc=; b=OgcSu5aXZSs7lbyBAB0iu5BWBQfxexnLLJOba/d2Yza4K72ZWbqdk+x+fzXSYDa39P MK4H5zBeF4ZUbjSZKdtCObuPS3d1ZedBERK40OU417Mt3VyxrgCVBa3q81uqjLKxRa/y gTSQ8a7VtCaVaDuwI775i56/GAnnxRRxRwwv3SZ7N3yvIWhTDVjSO67SV9y0OvZ4ehOM Rh7/x/bmdlYKVunR8jzI2RRNl9AgZQGpDkD7ww828srl67u0ptxsC40T4+OmfNxNZNSk vCLhokRDgazSqVvMc/vIqq5oXb+NO+byGhD6Ex2m3lTB2i4tmLCwvLKLm0zrMoFsLkWL 91OQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 r15si3202894edx.362.2020.04.22.05.26.45; Wed, 22 Apr 2020 05:27:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728371AbgDVMVH (ORCPT + 99 others); Wed, 22 Apr 2020 08:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728566AbgDVMRc (ORCPT ); Wed, 22 Apr 2020 08:17:32 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A00F3C03C1AB; Wed, 22 Apr 2020 05:17:32 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jREJi-0007m0-BS; Wed, 22 Apr 2020 14:17:26 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id DB6F11C0813; Wed, 22 Apr 2020 14:17:22 +0200 (CEST) Date: Wed, 22 Apr 2020 12:17:22 -0000 From: "tip-bot2 for Adrian Hunter" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf evsel: Be consistent when looking which evsel PERF_SAMPLE_ bits are set Cc: Adrian Hunter , Andi Kleen , Jiri Olsa , Arnaldo Carvalho de Melo , x86 , LKML In-Reply-To: <20200401101613.6201-11-adrian.hunter@intel.com> References: <20200401101613.6201-11-adrian.hunter@intel.com> MIME-Version: 1.0 Message-ID: <158755784249.28353.1495404549077332838.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 8e94b3243a9af2c49a38fd0d6f2f9beb542e41a4 Gitweb: https://git.kernel.org/tip/8e94b3243a9af2c49a38fd0d6f2f9beb542e41a4 Author: Adrian Hunter AuthorDate: Wed, 01 Apr 2020 13:16:07 +03:00 Committer: Arnaldo Carvalho de Melo CommitterDate: Thu, 16 Apr 2020 12:19:17 -03:00 perf evsel: Be consistent when looking which evsel PERF_SAMPLE_ bits are set Using 'type' variable for checking for callchains is equivalent to using evsel__has_callchain(evsel) and is how the other PERF_SAMPLE_ bits are checked in this function, so use it to be consistent. Signed-off-by: Adrian Hunter Cc: Andi Kleen Cc: Jiri Olsa Link: http://lore.kernel.org/lkml/20200401101613.6201-11-adrian.hunter@intel.com [ split from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d23db67..f320ada 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2136,7 +2136,7 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event, } } - if (evsel__has_callchain(evsel)) { + if (type & PERF_SAMPLE_CALLCHAIN) { const u64 max_callchain_nr = UINT64_MAX / sizeof(u64); OVERFLOW_CHECK_u64(array);