From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932127AbeAKG2x (ORCPT + 1 other); Thu, 11 Jan 2018 01:28:53 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48373 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753712AbeAKG2w (ORCPT ); Thu, 11 Jan 2018 01:28:52 -0500 Date: Wed, 10 Jan 2018 22:25:23 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, ak@linux.intel.com, tglx@linutronix.de, dsahern@gmail.com, hpa@zytor.com, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@redhat.com, alexander.shishkin@linux.intel.com Reply-To: dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, acme@redhat.com, peterz@infradead.org, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, ak@linux.intel.com, namhyung@kernel.org In-Reply-To: <20180107160356.28203-5-jolsa@kernel.org> References: <20180107160356.28203-5-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf: Add sample_id to PERF_RECORD_ITRACE_START event comment Git-Commit-ID: 81df978c49379481716aef591de77313c286d747 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 Return-Path: Commit-ID: 81df978c49379481716aef591de77313c286d747 Gitweb: https://git.kernel.org/tip/81df978c49379481716aef591de77313c286d747 Author: Jiri Olsa AuthorDate: Sun, 7 Jan 2018 17:03:48 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 8 Jan 2018 12:32:25 -0300 perf: Add sample_id to PERF_RECORD_ITRACE_START event comment Adding missing sample_id line into PERF_RECORD_ITRACE_START event comment. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20180107160356.28203-5-jolsa@kernel.org [ Update the tools/include/uapi/linux copy ] Signed-off-by: Arnaldo Carvalho de Melo --- include/uapi/linux/perf_event.h | 1 + tools/include/uapi/linux/perf_event.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index b9a4953..8bb66e8 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -864,6 +864,7 @@ enum perf_event_type { * struct perf_event_header header; * u32 pid; * u32 tid; + * struct sample_id sample_id; * }; */ PERF_RECORD_ITRACE_START = 12, diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index b9a4953..8bb66e8 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -864,6 +864,7 @@ enum perf_event_type { * struct perf_event_header header; * u32 pid; * u32 tid; + * struct sample_id sample_id; * }; */ PERF_RECORD_ITRACE_START = 12,