From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754647AbbIITuv (ORCPT ); Wed, 9 Sep 2015 15:50:51 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:59921 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751793AbbIITuo (ORCPT ); Wed, 9 Sep 2015 15:50:44 -0400 From: Arnaldo Carvalho de Melo To: Kan Liang Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Borislav Petkov , David Ahern , Frederic Weisbecker , Jiri Olsa , Namhyung Kim , Stephane Eranian , Wang Nan Subject: [PATCH 13/13] Revert "perf evlist: Add backpointer for perf_env to evlist" Date: Wed, 9 Sep 2015 16:50:25 -0300 Message-Id: <1441828225-667-14-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1441828225-667-1-git-send-email-acme@kernel.org> References: <1441828225-667-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.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: Arnaldo Carvalho de Melo This reverts commit 2c07144dfce366e21465cc7b0ada9f0b6dc7b7ed. We don't need it, machine->env provides what is needed. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Kan Liang Cc: Namhyung Kim Cc: Stephane Eranian Cc: Wang Nan Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evlist.h | 1 - tools/perf/util/header.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index b39a6198f4ac..436e358300b1 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -56,7 +56,6 @@ struct perf_evlist { struct cpu_map *cpus; struct perf_evsel *selected; struct events_stats stats; - struct perf_env *env; }; struct perf_evsel_str_handler { diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 085bbc35c186..64adbff36e04 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -2558,8 +2558,8 @@ int perf_session__read_header(struct perf_session *session) if (session->evlist == NULL) return -ENOMEM; - session->evlist->env = &header->env; session->machines.host.env = &header->env; + if (perf_data_file__is_pipe(file)) return perf_header__read_pipe(session); -- 2.1.0