aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/alpha/include/uapi/asm/mman.h4
-rw-r--r--arch/mips/include/uapi/asm/mman.h4
-rw-r--r--arch/parisc/include/uapi/asm/mman.h4
-rw-r--r--arch/x86/mm/mpx.c2
-rw-r--r--arch/xtensa/include/uapi/asm/mman.h4
-rw-r--r--include/asm-generic/page.h2
-rw-r--r--include/drm/drmP.h3
-rw-r--r--include/uapi/asm-generic/mman-common.h4
-rw-r--r--include/uapi/linux/mman.h4
9 files changed, 12 insertions, 19 deletions
diff --git a/arch/alpha/include/uapi/asm/mman.h b/arch/alpha/include/uapi/asm/mman.h
index f9d4e6b6d4bd..ac23379b7a87 100644
--- a/arch/alpha/include/uapi/asm/mman.h
+++ b/arch/alpha/include/uapi/asm/mman.h
@@ -10,9 +10,7 @@
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 */
diff --git a/arch/mips/include/uapi/asm/mman.h b/arch/mips/include/uapi/asm/mman.h
index 3035ca499cd8..c2b40969eb1f 100644
--- a/arch/mips/include/uapi/asm/mman.h
+++ b/arch/mips/include/uapi/asm/mman.h
@@ -27,9 +27,7 @@
27/* 27/*
28 * Flags for mmap 28 * 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
diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h
index 870fbf8c7088..c98162f494db 100644
--- a/arch/parisc/include/uapi/asm/mman.h
+++ b/arch/parisc/include/uapi/asm/mman.h
@@ -10,9 +10,7 @@
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 */
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index de1851d15699..c805db6236b4 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -9,12 +9,12 @@
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>
diff --git a/arch/xtensa/include/uapi/asm/mman.h b/arch/xtensa/include/uapi/asm/mman.h
index 58f29a9d895d..be726062412b 100644
--- a/arch/xtensa/include/uapi/asm/mman.h
+++ b/arch/xtensa/include/uapi/asm/mman.h
@@ -34,9 +34,7 @@
34/* 34/*
35 * Flags for mmap 35 * 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
diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h
index 27bf3377b0cb..fe801f01625e 100644
--- a/include/asm-generic/page.h
+++ b/include/asm-generic/page.h
@@ -7,7 +7,7 @@
7 */ 7 */
8 8
9#ifdef CONFIG_MMU 9#ifdef CONFIG_MMU
10#error need to prove a real asm/page.h 10#error need to provide a real asm/page.h
11#endif 11#endif
12 12
13 13
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index bdb0d5548f39..a3184416ddc5 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -57,8 +57,7 @@
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
diff --git a/include/uapi/asm-generic/mman-common.h b/include/uapi/asm-generic/mman-common.h
index e7ee32861d51..abd238d0f7a4 100644
--- a/include/uapi/asm-generic/mman-common.h
+++ b/include/uapi/asm-generic/mman-common.h
@@ -15,9 +15,7 @@
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 */
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 @@
12#define OVERCOMMIT_ALWAYS 1 12#define OVERCOMMIT_ALWAYS 1
13#define OVERCOMMIT_NEVER 2 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 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page 20 * 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.
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-29 19:41:07 -0500