deduplicate bits/mman.h

currently five targets use the same mman.h constants and the rest
share most constants too, so move them to sys/mman.h before the
bits/mman.h include where the differences can be corrected by
redefinition of the macros.

this fixes two minor bugs: POSIX_MADV_DONTNEED was wrong on most
targets (it should be the same as MADV_DONTNEED), and sh defined
the x86-only MAP_32BIT mmap flag.

diff --git a/arch/aarch64/bits/mman.h b/arch/aarch64/bits/mman.h
deleted file mode 100644 (file)
index 31ece5b..0000000
--- a/arch/aarch64/bits/mman.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/arm/bits/mman.h b/arch/arm/bits/mman.h
deleted file mode 100644 (file)
index ea6f6a7..0000000
--- a/arch/arm/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/generic/bits/mman.h b/arch/generic/bits/mman.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/arch/i386/bits/mman.h b/arch/i386/bits/mman.h
index 0c9022fd6f9a62b7607564f3ad47f31993de59c2..ba2d6f7a834649921636800343d1e0bf24be3b28 100644 (file)
--- a/arch/i386/bits/mman.h
+++ b/arch/i386/bits/mman.h
@@ -1,60 +1 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
 #define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/microblaze/bits/mman.h b/arch/microblaze/bits/mman.h
deleted file mode 100644 (file)
index ea6f6a7..0000000
--- a/arch/microblaze/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/mips/bits/mman.h b/arch/mips/bits/mman.h
index cb9ac539fdcad7490c89acc5c776aea6cffb6d42..c68aea88cf89ede0f3fd44f9b40e8c5726120f2f 100644 (file)
--- a/arch/mips/bits/mman.h
+++ b/arch/mips/bits/mman.h
@@ -1,58 +1,24 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
+#undef MAP_ANON
 #define MAP_ANON       0x800
-#define MAP_ANONYMOUS  MAP_ANON
+#undef MAP_NORESERVE
 #define MAP_NORESERVE  0x0400
+#undef MAP_GROWSDOWN
 #define MAP_GROWSDOWN  0x1000
+#undef MAP_DENYWRITE
 #define MAP_DENYWRITE  0x2000
+#undef MAP_EXECUTABLE
 #define MAP_EXECUTABLE 0x4000
+#undef MAP_LOCKED
 #define MAP_LOCKED     0x8000
+#undef MAP_POPULATE
 #define MAP_POPULATE   0x10000
+#undef MAP_NONBLOCK
 #define MAP_NONBLOCK   0x20000
+#undef MAP_STACK
 #define MAP_STACK      0x40000
+#undef MAP_HUGETLB
 #define MAP_HUGETLB    0x80000
 
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
+#undef MADV_SOFT_OFFLINE
 #endif

diff --git a/arch/mips64/bits/mman.h b/arch/mips64/bits/mman.h
index cb9ac539fdcad7490c89acc5c776aea6cffb6d42..c68aea88cf89ede0f3fd44f9b40e8c5726120f2f 100644 (file)
--- a/arch/mips64/bits/mman.h
+++ b/arch/mips64/bits/mman.h
@@ -1,58 +1,24 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
+#undef MAP_ANON
 #define MAP_ANON       0x800
-#define MAP_ANONYMOUS  MAP_ANON
+#undef MAP_NORESERVE
 #define MAP_NORESERVE  0x0400
+#undef MAP_GROWSDOWN
 #define MAP_GROWSDOWN  0x1000
+#undef MAP_DENYWRITE
 #define MAP_DENYWRITE  0x2000
+#undef MAP_EXECUTABLE
 #define MAP_EXECUTABLE 0x4000
+#undef MAP_LOCKED
 #define MAP_LOCKED     0x8000
+#undef MAP_POPULATE
 #define MAP_POPULATE   0x10000
+#undef MAP_NONBLOCK
 #define MAP_NONBLOCK   0x20000
+#undef MAP_STACK
 #define MAP_STACK      0x40000
+#undef MAP_HUGETLB
 #define MAP_HUGETLB    0x80000
 
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
+#undef MADV_SOFT_OFFLINE
 #endif

diff --git a/arch/or1k/bits/mman.h b/arch/or1k/bits/mman.h
deleted file mode 100644 (file)
index ea6f6a7..0000000
--- a/arch/or1k/bits/mman.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/powerpc/bits/mman.h b/arch/powerpc/bits/mman.h
index 6581edc53443b6b8b6aa259fa29432b20380c6e2..b6a15a1242a686f4e01bcb92d7eb9fd18a3b3b89 100644 (file)
--- a/arch/powerpc/bits/mman.h
+++ b/arch/powerpc/bits/mman.h
@@ -1,60 +1,8 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
 #define        PROT_SAO       0x10
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_NORESERVE  0x40
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x80
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
 
+#undef MCL_CURRENT
 #define MCL_CURRENT     0x2000
+#undef MCL_FUTURE
 #define MCL_FUTURE      0x4000
+#undef MCL_ONFAULT
 #define MCL_ONFAULT     0x8000
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/sh/bits/mman.h b/arch/sh/bits/mman.h
deleted file mode 100644 (file)
index 3a25df1..0000000
--- a/arch/sh/bits/mman.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define        PROT_GROWSDOWN 0x01000000
-#define        PROT_GROWSUP   0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
-#define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     4
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/x32/bits/mman.h b/arch/x32/bits/mman.h
index f3235f4e315e894dcb6e6a9a73978da7f840dd3a..ba2d6f7a834649921636800343d1e0bf24be3b28 100644 (file)
--- a/arch/x32/bits/mman.h
+++ b/arch/x32/bits/mman.h
@@ -1,60 +1 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
 #define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/arch/x86_64/bits/mman.h b/arch/x86_64/bits/mman.h
index f3235f4e315e894dcb6e6a9a73978da7f840dd3a..ba2d6f7a834649921636800343d1e0bf24be3b28 100644 (file)
--- a/arch/x86_64/bits/mman.h
+++ b/arch/x86_64/bits/mman.h
@@ -1,60 +1 @@
-#define MAP_FAILED ((void *) -1)
-
-#define        PROT_NONE      0
-#define        PROT_READ      1
-#define        PROT_WRITE     2
-#define        PROT_EXEC      4
-#define PROT_GROWSDOWN  0x01000000
-#define PROT_GROWSUP    0x02000000
-
-#define        MAP_SHARED     0x01
-#define        MAP_PRIVATE    0x02
-#define        MAP_FIXED      0x10
-
-#define MAP_TYPE       0x0f
-#define MAP_FILE       0x00
-#define MAP_ANON       0x20
-#define MAP_ANONYMOUS  MAP_ANON
 #define MAP_32BIT      0x40
-#define MAP_NORESERVE  0x4000
-#define MAP_GROWSDOWN  0x0100
-#define MAP_DENYWRITE  0x0800
-#define MAP_EXECUTABLE 0x1000
-#define MAP_LOCKED     0x2000
-#define MAP_POPULATE   0x8000
-#define MAP_NONBLOCK   0x10000
-#define MAP_STACK      0x20000
-#define MAP_HUGETLB    0x40000
-
-#define POSIX_MADV_NORMAL       0
-#define POSIX_MADV_RANDOM       1
-#define POSIX_MADV_SEQUENTIAL   2
-#define POSIX_MADV_WILLNEED     3
-#define POSIX_MADV_DONTNEED     0
-
-#define MS_ASYNC        1
-#define MS_INVALIDATE   2
-#define MS_SYNC         4
-
-#define MCL_CURRENT     1
-#define MCL_FUTURE      2
-#define MCL_ONFAULT     4
-
-#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define MADV_NORMAL      0
-#define MADV_RANDOM      1
-#define MADV_SEQUENTIAL  2
-#define MADV_WILLNEED    3
-#define MADV_DONTNEED    4
-#define MADV_REMOVE      9
-#define MADV_DONTFORK    10
-#define MADV_DOFORK      11
-#define MADV_MERGEABLE   12
-#define MADV_UNMERGEABLE 13
-#define MADV_HUGEPAGE    14
-#define MADV_NOHUGEPAGE  15
-#define MADV_DONTDUMP    16
-#define MADV_DODUMP      17
-#define MADV_HWPOISON    100
-#define MADV_SOFT_OFFLINE 101
-#endif

diff --git a/include/sys/mman.h b/include/sys/mman.h
index a1864ec81fc8e0c220e95407702e2d7ca2762d96..596a03a70ce7ecf7c6e77ed6027975614ef98ed0 100644 (file)
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -16,6 +16,65 @@ extern "C" {
 
 #include <bits/alltypes.h>
 
+#define MAP_FAILED ((void *) -1)
+
+#define MAP_SHARED     0x01
+#define MAP_PRIVATE    0x02
+#define MAP_TYPE       0x0f
+#define MAP_FIXED      0x10
+#define MAP_ANON       0x20
+#define MAP_ANONYMOUS  MAP_ANON
+#define MAP_NORESERVE  0x4000
+#define MAP_GROWSDOWN  0x0100
+#define MAP_DENYWRITE  0x0800
+#define MAP_EXECUTABLE 0x1000
+#define MAP_LOCKED     0x2000
+#define MAP_POPULATE   0x8000
+#define MAP_NONBLOCK   0x10000
+#define MAP_STACK      0x20000
+#define MAP_HUGETLB    0x40000
+#define MAP_FILE       0
+
+#define PROT_NONE      0
+#define PROT_READ      1
+#define PROT_WRITE     2
+#define PROT_EXEC      4
+#define PROT_GROWSDOWN 0x01000000
+#define PROT_GROWSUP   0x02000000
+
+#define MS_ASYNC       1
+#define MS_INVALIDATE  2
+#define MS_SYNC        4
+
+#define MCL_CURRENT    1
+#define MCL_FUTURE     2
+#define MCL_ONFAULT    4
+
+#define POSIX_MADV_NORMAL     0
+#define POSIX_MADV_RANDOM     1
+#define POSIX_MADV_SEQUENTIAL 2
+#define POSIX_MADV_WILLNEED   3
+#define POSIX_MADV_DONTNEED   4
+
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define MADV_NORMAL      0
+#define MADV_RANDOM      1
+#define MADV_SEQUENTIAL  2
+#define MADV_WILLNEED    3
+#define MADV_DONTNEED    4
+#define MADV_REMOVE      9
+#define MADV_DONTFORK    10
+#define MADV_DOFORK      11
+#define MADV_MERGEABLE   12
+#define MADV_UNMERGEABLE 13
+#define MADV_HUGEPAGE    14
+#define MADV_NOHUGEPAGE  15
+#define MADV_DONTDUMP    16
+#define MADV_DODUMP      17
+#define MADV_HWPOISON    100
+#define MADV_SOFT_OFFLINE 101
+#endif
+
 #include <bits/mman.h>
 
 void *mmap (void *, size_t, int, int, int, off_t);