From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752878AbbIOHDZ (ORCPT ); Tue, 15 Sep 2015 03:03:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50157 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751844AbbIOHDW (ORCPT ); Tue, 15 Sep 2015 03:03:22 -0400 Date: Tue, 15 Sep 2015 00:03:10 -0700 From: tip-bot for Kan Liang Message-ID: Cc: linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, kan.liang@intel.com, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, kan.liang@intel.com, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf env: Read msr pmu type from header Git-Commit-ID: e0838e029f4f6f271d6172b18f5473558ebdea1b 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: e0838e029f4f6f271d6172b18f5473558ebdea1b Gitweb: http://git.kernel.org/tip/e0838e029f4f6f271d6172b18f5473558ebdea1b Author: Kan Liang AuthorDate: Thu, 10 Sep 2015 11:03:05 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 14 Sep 2015 12:50:24 -0300 perf env: Read msr pmu type from header Get msr pmu type when processing pmu_mappings Signed-off-by: Kan Liang Acked-by: Jiri Olsa Link: http://lkml.kernel.org/n/tip-3ngei63gepydwxhvytl2wx89@git.kernel.org [ Fixed it up wrt moving perf_env from header.h ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/env.h | 1 + tools/perf/util/header.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 70124d9..d0d1a96 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -16,6 +16,7 @@ struct perf_env { char *cpu_desc; char *cpuid; unsigned long long total_mem; + unsigned int msr_pmu_type; int nr_cmdline; int nr_sibling_cores; diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 151b831..f307b17 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1787,6 +1787,9 @@ static int process_pmu_mappings(struct perf_file_section *section __maybe_unused /* include a NULL character at the end */ strbuf_add(&sb, "", 1); + if (!strcmp(name, "msr")) + ph->env.msr_pmu_type = type; + free(name); pmu_num--; }