]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
tools: Update asm-generic/mman-common.h copy from the kernel
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 25 Oct 2016 20:02:11 +0000 (17:02 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 28 Oct 2016 13:29:43 +0000 (11:29 -0200)
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 <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-yev9rexu02cl7cjeozzmrl9t@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/uapi/asm-generic/mman-common.h

index 58274382a6164de8e9d03ec85da0cf07996869d6..8c27db0c5c08ce84fc7299bd9bff2cee571b9397 100644 (file)
@@ -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 */