diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-03-29 23:28:58 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-03-29 23:28:58 +0300 |
| commit | 22261fdf68f23df3ddf359642696d6ce98e584fa (patch) | |
| tree | 8016316344a17dd8b88ef042a7cfff7f52a10b30 /tools/arch/parisc/include/uapi/asm/mman.h | |
| parent | 1a9df9e29c2afecf6e3089442d429b377279ca3c (diff) | |
| parent | e94d6b7f615e6dfbaf9fba7db6011db561461d0c (diff) | |
| download | linux-22261fdf68f23df3ddf359642696d6ce98e584fa.tar.xz | |
Merge tag 'perf-urgent-for-mingo-5.1-20190329' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo:
Core libraries:
Jiri Olsa:
- Fix max perf_event_attr.precise_ip detection.
Kan Liang:
- Fix parser error for uncore event alias
Wei Lin:
- Fixup ordering of kernel maps after obtaining the main kernel map address.
Intel PT:
Adrian Hunter:
- Fix TSC slip where A TSC packet can slip past MTC packets so that the
timestamp appears to go backwards.
- Fixes for exported-sql-viewer GUI conversion to python3.
ARM coresight:
Solomon Tan:
- Fix the build by adding a missing case value for enumeration value introduced
in newer library, that now is the required one.
tool headers:
Arnaldo Carvalho de Melo:
- Syncronize kernel headers with the kernel, getting new io_uring and
pidfd_send_signal syscalls so that 'perf trace' can handle them.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/arch/parisc/include/uapi/asm/mman.h')
| -rw-r--r-- | tools/arch/parisc/include/uapi/asm/mman.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/arch/parisc/include/uapi/asm/mman.h b/tools/arch/parisc/include/uapi/asm/mman.h index 1bd78758bde9..f9fd1325f5bd 100644 --- a/tools/arch/parisc/include/uapi/asm/mman.h +++ b/tools/arch/parisc/include/uapi/asm/mman.h @@ -27,8 +27,6 @@ #define MAP_NONBLOCK 0x20000 #define MAP_NORESERVE 0x4000 #define MAP_POPULATE 0x10000 -#define MAP_PRIVATE 0x02 -#define MAP_SHARED 0x01 #define MAP_STACK 0x40000 #define PROT_EXEC 0x4 #define PROT_GROWSDOWN 0x01000000 |