From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034439AbcJ1Rs1 (ORCPT ); Fri, 28 Oct 2016 13:48:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33068 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034031AbcJ1RsY (ORCPT ); Fri, 28 Oct 2016 13:48:24 -0400 Date: Fri, 28 Oct 2016 10:48:13 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, adrian.hunter@intel.com, jolsa@kernel.org, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Update asm-generic/mman-common.h copy from the kernel Git-Commit-ID: 0fb75c8ce15be60e768c06adabf00ff79e5c2501 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: 0fb75c8ce15be60e768c06adabf00ff79e5c2501 Gitweb: http://git.kernel.org/tip/0fb75c8ce15be60e768c06adabf00ff79e5c2501 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 25 Oct 2016 17:02:11 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 28 Oct 2016 11:29:43 -0200 tools: Update asm-generic/mman-common.h copy from the kernel To get the defines introduced in the commit e8c24d3a23a4 ("x86/pkeys: Allocation/free syscalls") Silencing this perf build warning: Warning: tools/include/uapi/asm-generic/mman-common.h differs from kernel Need to change 'perf trace' to beautify those syscalls, as soon as booting with a kernel with it. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-yev9rexu02cl7cjeozzmrl9t@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/uapi/asm-generic/mman-common.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/include/uapi/asm-generic/mman-common.h b/tools/include/uapi/asm-generic/mman-common.h index 5827438..8c27db0 100644 --- a/tools/include/uapi/asm-generic/mman-common.h +++ b/tools/include/uapi/asm-generic/mman-common.h @@ -72,4 +72,9 @@ #define MAP_HUGE_SHIFT 26 #define MAP_HUGE_MASK 0x3f +#define PKEY_DISABLE_ACCESS 0x1 +#define PKEY_DISABLE_WRITE 0x2 +#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\ + PKEY_DISABLE_WRITE) + #endif /* __ASM_GENERIC_MMAN_COMMON_H */