From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754682AbeEaKq0 (ORCPT ); Thu, 31 May 2018 06:46:26 -0400 Received: from terminus.zytor.com ([198.137.202.136]:48299 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754562AbeEaKqX (ORCPT ); Thu, 31 May 2018 06:46:23 -0400 Date: Thu, 31 May 2018 03:46:06 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: kim.phillips@arm.com, dsahern@gmail.com, wangnan0@huawei.com, tmricht@linux.ibm.com, lakshmana@google.com, mingo@kernel.org, namhyung@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, sque@chromium.org, jolsa@kernel.org, brueckner@linux.vnet.ibm.com, acme@redhat.com, hekuang@huawei.com, yao.jin@linux.intel.com, ak@linux.intel.com, hpa@zytor.com, tglx@linutronix.de Reply-To: dsahern@gmail.com, kim.phillips@arm.com, tmricht@linux.ibm.com, lakshmana@google.com, wangnan0@huawei.com, eranian@google.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, sque@chromium.org, jolsa@kernel.org, brueckner@linux.vnet.ibm.com, acme@redhat.com, hekuang@huawei.com, yao.jin@linux.intel.com, ak@linux.intel.com, hpa@zytor.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Fix perf.data format description of NRCPUS header Git-Commit-ID: 18a7057420f8b67f15d17087bf5c0863db752c8b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 18a7057420f8b67f15d17087bf5c0863db752c8b Gitweb: https://git.kernel.org/tip/18a7057420f8b67f15d17087bf5c0863db752c8b Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 25 May 2018 16:37:36 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 30 May 2018 15:40:26 -0300 perf tools: Fix perf.data format description of NRCPUS header In the perf.data HEADER_CPUDESC feadure header we store first the number of available CPUs in the system, then the number of CPUs at the time of writing the header, not the other way around. Reported-by: Thomas-Mich Richter Acked-by: Andi Kleen Cc: Adrian Hunter Cc: David Ahern Cc: He Kuang Cc: Hendrik Brueckner Cc: Jin Yao Cc: Jiri Olsa Cc: Kim Phillips Cc: Lakshman Annadorai Cc: Namhyung Kim Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-j7o92acm2vnxjv70y4o3swoc@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf.data-file-format.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt index c57904a526ce..dfb218feaad9 100644 --- a/tools/perf/Documentation/perf.data-file-format.txt +++ b/tools/perf/Documentation/perf.data-file-format.txt @@ -111,8 +111,8 @@ A perf_header_string with the CPU architecture (uname -m) A structure defining the number of CPUs. struct nr_cpus { - uint32_t nr_cpus_online; uint32_t nr_cpus_available; /* CPUs not yet onlined */ + uint32_t nr_cpus_online; }; HEADER_CPUDESC = 8,