1 files changed, 2 insertions, 31 deletions
diff --git a/include/asm-m32r/mman.h b/include/asm-m32r/mman.h
index 6b02fe3fcff2..695a860c024f 100644
--- a/include/asm-m32r/mman.h
+++ b/include/asm-m32r/mman.h
@@ -1,21 +1,9 @@
 #ifndef __M32R_MMAN_H__
 #define __M32R_MMAN_H__
-/* orig : i386 2.6.0-test6 */
+#include <asm-generic/mman.h>
-#define PROT_READ       0x1             /* page can be read */
-#define PROT_WRITE      0x2             /* page can be written */
-#define PROT_EXEC       0x4             /* page can be executed */
-#define PROT_SEM        0x8             /* page may be used for atomic ops */
-#define PROT_NONE       0x0             /* page can not be accessed */
-#define PROT_GROWSDOWN  0x01000000      /* mprotect flag: extend change to start of growsdown vma */
-#define PROT_GROWSUP    0x02000000      /* mprotect flag: extend change to end of growsup vma */
-#define MAP_SHARED      0x01            /* Share changes */
+/* orig : i386 2.6.0-test6 */
-#define MAP_PRIVATE     0x02            /* Changes are private */
-#define MAP_TYPE        0x0f            /* Mask for type of mapping */
-#define MAP_FIXED       0x10            /* Interpret addr exactly */
-#define MAP_ANONYMOUS   0x20            /* don't use a file */
 #define MAP_GROWSDOWN   0x0100          /* stack-like segment */
 #define MAP_DENYWRITE   0x0800          /* ETXTBSY */
@@ -25,24 +13,7 @@
 #define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK    0x10000         /* do not block on IO */
-#define MS_ASYNC        1               /* sync memory asynchronously */
-#define MS_INVALIDATE   2               /* invalidate the caches */
-#define MS_SYNC         4               /* synchronous memory sync */
 #define MCL_CURRENT     1               /* lock all current mappings */
 #define MCL_FUTURE      2               /* lock all future mappings */
-#define MADV_NORMAL     0x0             /* default page-in behavior */
-#define MADV_RANDOM     0x1             /* page-in minimum required */
-#define MADV_SEQUENTIAL 0x2             /* read-ahead aggressively */
-#define MADV_WILLNEED   0x3             /* pre-fault pages */
-#define MADV_DONTNEED   0x4             /* discard these pages */
-#define MADV_REMOVE     0x5             /* remove these pages & resources */
-#define MADV_DONTFORK   0x30            /* dont inherit across fork */
-#define MADV_DOFORK     0x31            /* do inherit across fork */
-/* compatibility flags */
-#define MAP_ANON        MAP_ANONYMOUS
-#define MAP_FILE        0
 #endif /* __M32R_MMAN_H__ */

diff --git a/include/asm-m32r/mman.h b/include/asm-m32r/mman.h index 6b02fe3fcff2..695a860c024f 100644 --- a/include/asm-m32r/mman.h +++ b/include/asm-m32r/mman.h
@@ -1,21 +1,9 @@
1	#ifndef __M32R_MMAN_H__	1	#ifndef __M32R_MMAN_H__
2	#define __M32R_MMAN_H__	2	#define __M32R_MMAN_H__
3		3
4	/* orig : i386 2.6.0-test6 */	4	#include <asm-generic/mman.h>
5
6	#define PROT_READ 0x1 /* page can be read */
7	#define PROT_WRITE 0x2 /* page can be written */
8	#define PROT_EXEC 0x4 /* page can be executed */
9	#define PROT_SEM 0x8 /* page may be used for atomic ops */
10	#define PROT_NONE 0x0 /* page can not be accessed */
11	#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
12	#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
13		5
14	#define MAP_SHARED 0x01 /* Share changes */	6	/* orig : i386 2.6.0-test6 */
15	#define MAP_PRIVATE 0x02 /* Changes are private */
16	#define MAP_TYPE 0x0f /* Mask for type of mapping */
17	#define MAP_FIXED 0x10 /* Interpret addr exactly */
18	#define MAP_ANONYMOUS 0x20 /* don't use a file */
19		7
20	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */	8	#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
21	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */	9	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
@@ -25,24 +13,7 @@
25	#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */	13	#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
26	#define MAP_NONBLOCK 0x10000 /* do not block on IO */	14	#define MAP_NONBLOCK 0x10000 /* do not block on IO */
27		15
28	#define MS_ASYNC 1 /* sync memory asynchronously */
29	#define MS_INVALIDATE 2 /* invalidate the caches */
30	#define MS_SYNC 4 /* synchronous memory sync */
31
32	#define MCL_CURRENT 1 /* lock all current mappings */	16	#define MCL_CURRENT 1 /* lock all current mappings */
33	#define MCL_FUTURE 2 /* lock all future mappings */	17	#define MCL_FUTURE 2 /* lock all future mappings */
34		18
35	#define MADV_NORMAL 0x0 /* default page-in behavior */
36	#define MADV_RANDOM 0x1 /* page-in minimum required */
37	#define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */
38	#define MADV_WILLNEED 0x3 /* pre-fault pages */
39	#define MADV_DONTNEED 0x4 /* discard these pages */
40	#define MADV_REMOVE 0x5 /* remove these pages & resources */
41	#define MADV_DONTFORK 0x30 /* dont inherit across fork */
42	#define MADV_DOFORK 0x31 /* do inherit across fork */
43
44	/* compatibility flags */
45	#define MAP_ANON MAP_ANONYMOUS
46	#define MAP_FILE 0
47
48	#endif /* __M32R_MMAN_H__ */	19	#endif /* __M32R_MMAN_H__ */