1 files changed, 2 insertions, 28 deletions
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h
index a2e34c21b44f..24cf664a8295 100644
--- a/include/asm-powerpc/mman.h
+++ b/include/asm-powerpc/mman.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_POWERPC_MMAN_H
 #define _ASM_POWERPC_MMAN_H
+#include <asm-generic/mman.h>
 /*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -8,19 +10,6 @@
 * 2 of the License, or (at your option) any later version.
 */
-#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 */
-#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_RENAME      MAP_ANONYMOUS   /* In SunOS terminology */
 #define MAP_NORESERVE   0x40            /* don't reserve swap pages */
 #define MAP_LOCKED      0x80
@@ -29,25 +18,10 @@
 #define MAP_DENYWRITE   0x0800          /* ETXTBSY */
 #define MAP_EXECUTABLE  0x1000          /* mark it as an executable */
-#define MS_ASYNC        1               /* sync memory asynchronously */
-#define MS_INVALIDATE   2               /* invalidate the caches */
-#define MS_SYNC         4               /* synchronous memory sync */
 #define MCL_CURRENT     0x2000          /* lock all currently mapped pages */
 #define MCL_FUTURE      0x4000          /* lock all additions to address space */
 #define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK    0x10000         /* do not block on IO */
-#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 */
-/* compatibility flags */
-#define MAP_ANON        MAP_ANONYMOUS
-#define MAP_FILE        0
 #endif  /* _ASM_POWERPC_MMAN_H */

diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h index a2e34c21b44f..24cf664a8295 100644 --- a/include/asm-powerpc/mman.h +++ b/include/asm-powerpc/mman.h
@@ -1,6 +1,8 @@
1	#ifndef _ASM_POWERPC_MMAN_H	1	#ifndef _ASM_POWERPC_MMAN_H
2	#define _ASM_POWERPC_MMAN_H	2	#define _ASM_POWERPC_MMAN_H
3		3
		4	#include <asm-generic/mman.h>
		5
4	/*	6	/*
5	* This program is free software; you can redistribute it and/or	7	* This program is free software; you can redistribute it and/or
6	* modify it under the terms of the GNU General Public License	8	* modify it under the terms of the GNU General Public License
@@ -8,19 +10,6 @@
8	* 2 of the License, or (at your option) any later version.	10	* 2 of the License, or (at your option) any later version.
9	*/	11	*/
10		12
11	#define PROT_READ 0x1 /* page can be read */
12	#define PROT_WRITE 0x2 /* page can be written */
13	#define PROT_EXEC 0x4 /* page can be executed */
14	#define PROT_SEM 0x8 /* page may be used for atomic ops */
15	#define PROT_NONE 0x0 /* page can not be accessed */
16	#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
17	#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
18
19	#define MAP_SHARED 0x01 /* Share changes */
20	#define MAP_PRIVATE 0x02 /* Changes are private */
21	#define MAP_TYPE 0x0f /* Mask for type of mapping */
22	#define MAP_FIXED 0x10 /* Interpret addr exactly */
23	#define MAP_ANONYMOUS 0x20 /* don't use a file */
24	#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */	13	#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */
25	#define MAP_NORESERVE 0x40 /* don't reserve swap pages */	14	#define MAP_NORESERVE 0x40 /* don't reserve swap pages */
26	#define MAP_LOCKED 0x80	15	#define MAP_LOCKED 0x80
@@ -29,25 +18,10 @@
29	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */	18	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
30	#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */	19	#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
31		20
32	#define MS_ASYNC 1 /* sync memory asynchronously */
33	#define MS_INVALIDATE 2 /* invalidate the caches */
34	#define MS_SYNC 4 /* synchronous memory sync */
35
36	#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */	21	#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */
37	#define MCL_FUTURE 0x4000 /* lock all additions to address space */	22	#define MCL_FUTURE 0x4000 /* lock all additions to address space */
38		23
39	#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */	24	#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
40	#define MAP_NONBLOCK 0x10000 /* do not block on IO */	25	#define MAP_NONBLOCK 0x10000 /* do not block on IO */
41		26
42	#define MADV_NORMAL 0x0 /* default page-in behavior */
43	#define MADV_RANDOM 0x1 /* page-in minimum required */
44	#define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */
45	#define MADV_WILLNEED 0x3 /* pre-fault pages */
46	#define MADV_DONTNEED 0x4 /* discard these pages */
47	#define MADV_REMOVE 0x5 /* remove these pages & resources */
48
49	/* compatibility flags */
50	#define MAP_ANON MAP_ANONYMOUS
51	#define MAP_FILE 0
52
53	#endif /* _ASM_POWERPC_MMAN_H */	27	#endif /* _ASM_POWERPC_MMAN_H */