From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964848AbbJ2JlF (ORCPT ); Thu, 29 Oct 2015 05:41:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56101 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756271AbbJ2JlB (ORCPT ); Thu, 29 Oct 2015 05:41:01 -0400 Date: Thu, 29 Oct 2015 02:40:47 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com Reply-To: a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org In-Reply-To: <1445784728-21732-29-git-send-email-jolsa@kernel.org> References: <1445784728-21732-29-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Move id_offset out of struct perf_evsel union member Git-Commit-ID: af3399817428d8adc2c87c91df23fde77dbcdb35 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: af3399817428d8adc2c87c91df23fde77dbcdb35 Gitweb: http://git.kernel.org/tip/af3399817428d8adc2c87c91df23fde77dbcdb35 Author: Jiri Olsa AuthorDate: Sun, 25 Oct 2015 15:51:44 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 27 Oct 2015 15:04:29 -0300 perf evsel: Move id_offset out of struct perf_evsel union member Because the 'perf stat record' patches will use the id_offset member together with the priv pointer. Signed-off-by: Jiri Olsa Tested-by: Kan Liang Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1445784728-21732-29-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 02a5fed..0e22c0b 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -90,9 +90,9 @@ struct perf_evsel { double scale; const char *unit; struct event_format *tp_format; + off_t id_offset; union { void *priv; - off_t id_offset; u64 db_id; }; struct cgroup_sel *cgrp;