History

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

Linus Torvalds committed 7 years ago

Commit fa29f5b2 parents 78e10b5 d7244449 files · +12 −19Browse files

Unified · Split

9 files
  1. arch/alpha/include/uapi/asm/mman.h +1 −3
  2. arch/mips/include/uapi/asm/mman.h +1 −3
  3. arch/parisc/include/uapi/asm/mman.h +1 −3
  4. arch/x86/mm/mpx.c +1 −1
  5. arch/xtensa/include/uapi/asm/mman.h +1 −3
  6. include/asm-generic/page.h +1 −1
  7. include/drm/drmP.h +1 −2
  8. include/uapi/asm-generic/mman-common.h +1 −3
  9. include/uapi/linux/mman.h +4 −0
arch/alpha/include/uapi/asm/mman.h+1−3
@@ -10,9 +10,7 @@ · 9 unmodified lines
1010 #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
1111 #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
1212
13−#define MAP_SHARED 0x01 /* Share changes */
14−#define MAP_PRIVATE 0x02 /* Changes are private */
15−#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
13+/* 0x01 - 0x03 are defined in linux/mman.h */
1614 #define MAP_TYPE 0x0f /* Mask for type of mapping (OSF/1 is _wrong_) */
1715 #define MAP_FIXED 0x100 /* Interpret addr exactly */
1816 #define MAP_ANONYMOUS 0x10 /* don't use a file */
arch/mips/include/uapi/asm/mman.h+1−3
@@ -27,9 +27,7 @@ · 26 unmodified lines
2727 /*
2828 * Flags for mmap
2929 */
30−#define MAP_SHARED 0x001 /* Share changes */
31−#define MAP_PRIVATE 0x002 /* Changes are private */
32−#define MAP_SHARED_VALIDATE 0x003 /* share + validate extension flags */
30+/* 0x01 - 0x03 are defined in linux/mman.h */
3331 #define MAP_TYPE 0x00f /* Mask for type of mapping */
3432 #define MAP_FIXED 0x010 /* Interpret addr exactly */
3533
arch/parisc/include/uapi/asm/mman.h+1−3
@@ -10,9 +10,7 @@ · 9 unmodified lines
1010 #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
1111 #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
1212
13−#define MAP_SHARED 0x01 /* Share changes */
14−#define MAP_PRIVATE 0x02 /* Changes are private */
15−#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
13+/* 0x01 - 0x03 are defined in linux/mman.h */
1614 #define MAP_TYPE 0x2b /* Mask for type of mapping, includes bits 0x08 and 0x20 */
1715 #define MAP_FIXED 0x04 /* Interpret addr exactly */
1816 #define MAP_ANONYMOUS 0x10 /* don't use a file */
arch/x86/mm/mpx.c+1−1
@@ -9,12 +9,12 @@ · 8 unmodified lines
99 #include <linux/kernel.h>
1010 #include <linux/slab.h>
1111 #include <linux/mm_types.h>
12+#include <linux/mman.h>
1213 #include <linux/syscalls.h>
1314 #include <linux/sched/sysctl.h>
1415
1516 #include <asm/insn.h>
1617 #include <asm/insn-eval.h>
17−#include <asm/mman.h>
1818 #include <asm/mmu_context.h>
1919 #include <asm/mpx.h>
2020 #include <asm/processor.h>
arch/xtensa/include/uapi/asm/mman.h+1−3
@@ -34,9 +34,7 @@ · 33 unmodified lines
3434 /*
3535 * Flags for mmap
3636 */
37−#define MAP_SHARED 0x001 /* Share changes */
38−#define MAP_PRIVATE 0x002 /* Changes are private */
39−#define MAP_SHARED_VALIDATE 0x003 /* share + validate extension flags */
37+/* 0x01 - 0x03 are defined in linux/mman.h */
4038 #define MAP_TYPE 0x00f /* Mask for type of mapping */
4139 #define MAP_FIXED 0x010 /* Interpret addr exactly */
4240
include/asm-generic/page.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
77 */
88
99 #ifdef CONFIG_MMU
10−#error need to prove a real asm/page.h
10+#error need to provide a real asm/page.h
1111 #endif
1212
1313
include/drm/drmP.h+1−2
@@ -57,8 +57,7 @@ · 56 unmodified lines
5757 #include <linux/workqueue.h>
5858 #include <linux/dma-fence.h>
5959 #include <linux/module.h>
60−
61−#include <asm/mman.h>
60+#include <linux/mman.h>
6261 #include <asm/pgalloc.h>
6362 #include <linux/uaccess.h>
6463
include/uapi/asm-generic/mman-common.h+1−3
@@ -15,9 +15,7 @@ · 14 unmodified lines
1515 #define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
1616 #define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
1717
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 */
2119 #define MAP_TYPE 0x0f /* Mask for type of mapping */
2220 #define MAP_FIXED 0x10 /* Interpret addr exactly */
2321 #define MAP_ANONYMOUS 0x20 /* don't use a file */
include/uapi/linux/mman.h+4−0
@@ -12,6 +12,10 @@ · 11 unmodified lines
1212 #define OVERCOMMIT_ALWAYS 1
1313 #define OVERCOMMIT_NEVER 2
1414
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+
1519 /*
1620 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page
1721 * size other than the default is desired. See hugetlb_encode.h.