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
Showing the changes to include/uapi (2 of 9 files). Show all
Unified · Split
| @@ -15,9 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */ |
| 16 | 16 | #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */ |
| 17 | 17 | |
| 18 | −#define MAP_SHARED 0x01 /* Share changes */ | |
| 19 | −#define MAP_PRIVATE 0x02 /* Changes are private */ | |
| 20 | −#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ | |
| 18 | +/* 0x01 - 0x03 are defined in linux/mman.h */ | |
| 21 | 19 | #define MAP_TYPE 0x0f /* Mask for type of mapping */ |
| 22 | 20 | #define MAP_FIXED 0x10 /* Interpret addr exactly */ |
| 23 | 21 | #define MAP_ANONYMOUS 0x20 /* don't use a file */ |
| @@ -12,6 +12,10 @@ · 11 unmodified lines | ||
| 12 | 12 | #define OVERCOMMIT_ALWAYS 1 |
| 13 | 13 | #define OVERCOMMIT_NEVER 2 |
| 14 | 14 | |
| 15 | +#define MAP_SHARED 0x01 /* Share changes */ | |
| 16 | +#define MAP_PRIVATE 0x02 /* Changes are private */ | |
| 17 | +#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ | |
| 18 | + | |
| 15 | 19 | /* |
| 16 | 20 | * Huge page size encoding when MAP_HUGETLB is specified, and a huge page |
| 17 | 21 | * size other than the default is desired. See hugetlb_encode.h. |