From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755505AbbINQix (ORCPT ); Mon, 14 Sep 2015 12:38:53 -0400 Received: from casper.infradead.org ([85.118.1.10]:38112 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754806AbbINQiu (ORCPT ); Mon, 14 Sep 2015 12:38:50 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Kan Liang , Arnaldo Carvalho de Melo Subject: [PATCH 17/27] perf env: Read msr pmu type from header Date: Mon, 14 Sep 2015 13:38:20 -0300 Message-Id: <1442248710-2339-18-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1442248710-2339-1-git-send-email-acme@kernel.org> References: <1442248710-2339-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kan Liang 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 70124d9a1624..d0d1a9681531 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 151b8310ac70..f307b17aa45e 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--; } -- 2.1.0