diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 22:44:39 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-05 22:44:39 +0300 |
commit | 9d9cc4aa004edc996ce560e57b1154f658681c05 (patch) | |
tree | 30b71e1aa3363083855edc22447c52585d04d224 /tools/include/uapi/asm-generic/mman.h | |
parent | c84e6d01eed16afa41a1c4ad9a6bd6a8bfe67af0 (diff) | |
parent | fb7df12d645cfba6a76a45fdcc7e3f7fbbcda661 (diff) | |
download | linux-9d9cc4aa004edc996ce560e57b1154f658681c05.tar.xz |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Various fixes:
- synchronize kernel and tooling headers
- cgroup support fix
- two tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools/headers: Synchronize kernel ABI headers
perf/cgroup: Fix perf cgroup hierarchy support
perf tools: Unwind properly location after REJECT
perf symbols: Fix memory corruption because of zero length symbols
Diffstat (limited to 'tools/include/uapi/asm-generic/mman.h')
-rw-r--r-- | tools/include/uapi/asm-generic/mman.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/uapi/asm-generic/mman.h b/tools/include/uapi/asm-generic/mman.h index f7c7b4355e56..2dffcbf705b3 100644 --- a/tools/include/uapi/asm-generic/mman.h +++ b/tools/include/uapi/asm-generic/mman.h @@ -1,8 +1,8 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef __ASM_GENERIC_MMAN_H #define __ASM_GENERIC_MMAN_H -#include <uapi/asm-generic/mman-common.h> +#include <asm-generic/mman-common.h> #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define MAP_DENYWRITE 0x0800 /* ETXTBSY */ |