From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753281AbdK2Gjh (ORCPT ); Wed, 29 Nov 2017 01:39:37 -0500 Received: from terminus.zytor.com ([65.50.211.136]:43045 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbdK2Gjf (ORCPT ); Wed, 29 Nov 2017 01:39:35 -0500 Date: Tue, 28 Nov 2017 22:37:15 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, will.deacon@arm.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, wangnan0@huawei.com, hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org Reply-To: will.deacon@arm.com, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, wangnan0@huawei.com, jolsa@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools headers: Synchronize perf_event.h header Git-Commit-ID: 0f1aabeb4932e48ce067cb8c88322277dd7af371 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: 0f1aabeb4932e48ce067cb8c88322277dd7af371 Gitweb: https://git.kernel.org/tip/0f1aabeb4932e48ce067cb8c88322277dd7af371 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 27 Nov 2017 11:35:52 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Nov 2017 14:29:49 -0300 tools headers: Synchronize perf_event.h header To get the changes in the 085b30625e39 ("perf/core: Add PERF_AUX_FLAG_COLLISION to report colliding samples") commit, that will be eventually used by perf to handle the ARM SPE architecture. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Cc: Will Deacon Link: https://lkml.kernel.org/n/tip-178ohv0oy0csq3kzfdk8ky4n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/linux/perf_event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h index 362493a..b9a4953 100644 --- a/tools/include/uapi/linux/perf_event.h +++ b/tools/include/uapi/linux/perf_event.h @@ -942,6 +942,7 @@ enum perf_callchain_context { #define PERF_AUX_FLAG_TRUNCATED 0x01 /* record was truncated to fit */ #define PERF_AUX_FLAG_OVERWRITE 0x02 /* snapshot from overwrite mode */ #define PERF_AUX_FLAG_PARTIAL 0x04 /* record contains gaps */ +#define PERF_AUX_FLAG_COLLISION 0x08 /* sample collided with another */ #define PERF_FLAG_FD_NO_GROUP (1UL << 0) #define PERF_FLAG_FD_OUTPUT (1UL << 1)