diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:18:43 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-06 09:18:43 -0800 |
commit | fa29f5ba42404b44aceb1a63ff4757efe5cd1789 (patch) | |
tree | 8dfe660eeb443561582efe2b0cc7c8b228172796 /include/uapi/linux | |
parent | Merge tag 'y2038-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground (diff) | |
parent | asm-generic/page.h: fix typo in #error text requiring a real asm/page.h (diff) | |
download | wireguard-linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.tar.xz wireguard-linux-fa29f5ba42404b44aceb1a63ff4757efe5cd1789.zip |
Merge tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic updates from Arnd Bergmann:
"Only a few small changes this time:
- Michael S. Tsirkin cleans up linux/mman.h
- Mike Rapoport found a typo
I had originally merged another cleanup series for I/O accessors from
Hugo Lefeuvre as well, but dropped it after the discussion of the
barrier semantics and some conflicts. I expect this series to get
merged for a later release though"
* tag 'asm-generic-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic/page.h: fix typo in #error text requiring a real asm/page.h
arch: move common mmap flags to linux/mman.h
drm: tweak header name
x86/mpx: tweak header name
Diffstat (limited to 'include/uapi/linux')
-rw-r--r-- | include/uapi/linux/mman.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index d0f515d53299..fc1a64c3447b 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -12,6 +12,10 @@ #define OVERCOMMIT_ALWAYS 1 #define OVERCOMMIT_NEVER 2 +#define MAP_SHARED 0x01 /* Share changes */ +#define MAP_PRIVATE 0x02 /* Changes are private */ +#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ + /* * Huge page size encoding when MAP_HUGETLB is specified, and a huge page * size other than the default is desired. See hugetlb_encode.h. |