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
10#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */10#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
11#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */11#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
12 12
13#define MAP_SHARED 0x01 /* Share changes */13/* 0x01 - 0x03 are defined in linux/mman.h */
14#define MAP_PRIVATE 0x02 /* Changes are private */
15#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
16#define MAP_TYPE 0x0f /* Mask for type of mapping (OSF/1 is _wrong_) */14#define MAP_TYPE 0x0f /* Mask for type of mapping (OSF/1 is _wrong_) */
17#define MAP_FIXED 0x100 /* Interpret addr exactly */15#define MAP_FIXED 0x100 /* Interpret addr exactly */
18#define MAP_ANONYMOUS 0x10 /* don't use a file */16#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
27/*27/*
28 * Flags for mmap28 * Flags for mmap
29 */29 */
30#define MAP_SHARED 0x001 /* Share changes */30/* 0x01 - 0x03 are defined in linux/mman.h */
31#define MAP_PRIVATE 0x002 /* Changes are private */
32#define MAP_SHARED_VALIDATE 0x003 /* share + validate extension flags */
33#define MAP_TYPE 0x00f /* Mask for type of mapping */31#define MAP_TYPE 0x00f /* Mask for type of mapping */
34#define MAP_FIXED 0x010 /* Interpret addr exactly */32#define MAP_FIXED 0x010 /* Interpret addr exactly */
35 33
arch/parisc/include/uapi/asm/mman.h+1−3
@@ -10,9 +10,7 @@ · 9 unmodified lines
10#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */10#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
11#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */11#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
12 12
13#define MAP_SHARED 0x01 /* Share changes */13/* 0x01 - 0x03 are defined in linux/mman.h */
14#define MAP_PRIVATE 0x02 /* Changes are private */
15#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
16#define MAP_TYPE 0x2b /* Mask for type of mapping, includes bits 0x08 and 0x20 */14#define MAP_TYPE 0x2b /* Mask for type of mapping, includes bits 0x08 and 0x20 */
17#define MAP_FIXED 0x04 /* Interpret addr exactly */15#define MAP_FIXED 0x04 /* Interpret addr exactly */
18#define MAP_ANONYMOUS 0x10 /* don't use a file */16#define MAP_ANONYMOUS 0x10 /* don't use a file */
arch/x86/mm/mpx.c+1−1
@@ -9,12 +9,12 @@ · 8 unmodified lines
9#include <linux/kernel.h>9#include <linux/kernel.h>
10#include <linux/slab.h>10#include <linux/slab.h>
11#include <linux/mm_types.h>11#include <linux/mm_types.h>
12#include <linux/mman.h>
12#include <linux/syscalls.h>13#include <linux/syscalls.h>
13#include <linux/sched/sysctl.h>14#include <linux/sched/sysctl.h>
14 15
15#include <asm/insn.h>16#include <asm/insn.h>
16#include <asm/insn-eval.h>17#include <asm/insn-eval.h>
17#include <asm/mman.h>
18#include <asm/mmu_context.h>18#include <asm/mmu_context.h>
19#include <asm/mpx.h>19#include <asm/mpx.h>
20#include <asm/processor.h>20#include <asm/processor.h>
arch/xtensa/include/uapi/asm/mman.h+1−3
@@ -34,9 +34,7 @@ · 33 unmodified lines
34/*34/*
35 * Flags for mmap35 * Flags for mmap
36 */36 */
37#define MAP_SHARED 0x001 /* Share changes */37/* 0x01 - 0x03 are defined in linux/mman.h */
38#define MAP_PRIVATE 0x002 /* Changes are private */
39#define MAP_SHARED_VALIDATE 0x003 /* share + validate extension flags */
40#define MAP_TYPE 0x00f /* Mask for type of mapping */38#define MAP_TYPE 0x00f /* Mask for type of mapping */
41#define MAP_FIXED 0x010 /* Interpret addr exactly */39#define MAP_FIXED 0x010 /* Interpret addr exactly */
42 40
include/asm-generic/page.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
7 */7 */
8 8
9#ifdef CONFIG_MMU9#ifdef CONFIG_MMU
10#error need to prove a real asm/page.h10#error need to provide a real asm/page.h
11#endif11#endif
12 12
13 13
include/drm/drmP.h+1−2
@@ -57,8 +57,7 @@ · 56 unmodified lines
57#include <linux/workqueue.h>57#include <linux/workqueue.h>
58#include <linux/dma-fence.h>58#include <linux/dma-fence.h>
59#include <linux/module.h>59#include <linux/module.h>
60 60#include <linux/mman.h>
61#include <asm/mman.h>
62#include <asm/pgalloc.h>61#include <asm/pgalloc.h>
63#include <linux/uaccess.h>62#include <linux/uaccess.h>
64 63
include/uapi/asm-generic/mman-common.h+1−3
@@ -15,9 +15,7 @@ · 14 unmodified lines
15#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */15#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
16#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */16#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
17 17
18#define MAP_SHARED 0x01 /* Share changes */18/* 0x01 - 0x03 are defined in linux/mman.h */
19#define MAP_PRIVATE 0x02 /* Changes are private */
20#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
21#define MAP_TYPE 0x0f /* Mask for type of mapping */19#define MAP_TYPE 0x0f /* Mask for type of mapping */
22#define MAP_FIXED 0x10 /* Interpret addr exactly */20#define MAP_FIXED 0x10 /* Interpret addr exactly */
23#define MAP_ANONYMOUS 0x20 /* don't use a file */21#define MAP_ANONYMOUS 0x20 /* don't use a file */
include/uapi/linux/mman.h+4−0
@@ -12,6 +12,10 @@ · 11 unmodified lines
12#define OVERCOMMIT_ALWAYS 112#define OVERCOMMIT_ALWAYS 1
13#define OVERCOMMIT_NEVER 213#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 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page20 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page
17 * size other than the default is desired. See hugetlb_encode.h.21 * size other than the default is desired. See hugetlb_encode.h.