1 files changed, 2 insertions, 27 deletions
diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h
index 98435ad8619e..88d1886abf3b 100644
--- a/include/asm-sparc/mman.h
+++ b/include/asm-sparc/mman.h
@@ -2,21 +2,10 @@
 #ifndef __SPARC_MMAN_H__
 #define __SPARC_MMAN_H__
+#include <asm-generic/mman.h>
 /* SunOS'ified... */
-#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_INHERIT     0x80            /* SunOS doesn't do this, but... */
@@ -27,10 +16,6 @@
 #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 */
@@ -48,16 +33,6 @@
 #define MC_LOCKAS       5  /* Lock an entire address space of the calling process */
 #define MC_UNLOCKAS     6  /* Unlock entire address space of calling process */
-#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_FREE       0x5             /* (Solaris) contents can be freed */
-#define MADV_REMOVE     0x6             /* remove these pages & resources */
-/* compatibility flags */
-#define MAP_ANON        MAP_ANONYMOUS
-#define MAP_FILE        0
 #endif /* __SPARC_MMAN_H__ */

diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h index 98435ad8619e..88d1886abf3b 100644 --- a/include/asm-sparc/mman.h +++ b/include/asm-sparc/mman.h
@@ -2,21 +2,10 @@
2	#ifndef __SPARC_MMAN_H__	2	#ifndef __SPARC_MMAN_H__
3	#define __SPARC_MMAN_H__	3	#define __SPARC_MMAN_H__
4		4
		5	#include <asm-generic/mman.h>
		6
5	/* SunOS'ified... */	7	/* SunOS'ified... */
6		8
7	#define PROT_READ 0x1 /* page can be read */
8	#define PROT_WRITE 0x2 /* page can be written */
9	#define PROT_EXEC 0x4 /* page can be executed */
10	#define PROT_SEM 0x8 /* page may be used for atomic ops */
11	#define PROT_NONE 0x0 /* page can not be accessed */
12	#define PROT_GROWSDOWN 0x01000000 /* mprotect flag: extend change to start of growsdown vma */
13	#define PROT_GROWSUP 0x02000000 /* mprotect flag: extend change to end of growsup vma */
14
15	#define MAP_SHARED 0x01 /* Share changes */
16	#define MAP_PRIVATE 0x02 /* Changes are private */
17	#define MAP_TYPE 0x0f /* Mask for type of mapping */
18	#define MAP_FIXED 0x10 /* Interpret addr exactly */
19	#define MAP_ANONYMOUS 0x20 /* don't use a file */
20	#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */	9	#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */
21	#define MAP_NORESERVE 0x40 /* don't reserve swap pages */	10	#define MAP_NORESERVE 0x40 /* don't reserve swap pages */
22	#define MAP_INHERIT 0x80 /* SunOS doesn't do this, but... */	11	#define MAP_INHERIT 0x80 /* SunOS doesn't do this, but... */
@@ -27,10 +16,6 @@
27	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */	16	#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
28	#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */	17	#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
29		18
30	#define MS_ASYNC 1 /* sync memory asynchronously */
31	#define MS_INVALIDATE 2 /* invalidate the caches */
32	#define MS_SYNC 4 /* synchronous memory sync */
33
34	#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */	19	#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */
35	#define MCL_FUTURE 0x4000 /* lock all additions to address space */	20	#define MCL_FUTURE 0x4000 /* lock all additions to address space */
36		21
@@ -48,16 +33,6 @@
48	#define MC_LOCKAS 5 /* Lock an entire address space of the calling process */	33	#define MC_LOCKAS 5 /* Lock an entire address space of the calling process */
49	#define MC_UNLOCKAS 6 /* Unlock entire address space of calling process */	34	#define MC_UNLOCKAS 6 /* Unlock entire address space of calling process */
50		35
51	#define MADV_NORMAL 0x0 /* default page-in behavior */
52	#define MADV_RANDOM 0x1 /* page-in minimum required */
53	#define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */
54	#define MADV_WILLNEED 0x3 /* pre-fault pages */
55	#define MADV_DONTNEED 0x4 /* discard these pages */
56	#define MADV_FREE 0x5 /* (Solaris) contents can be freed */	36	#define MADV_FREE 0x5 /* (Solaris) contents can be freed */
57	#define MADV_REMOVE 0x6 /* remove these pages & resources */
58
59	/* compatibility flags */
60	#define MAP_ANON MAP_ANONYMOUS
61	#define MAP_FILE 0
62		37
63	#endif /* __SPARC_MMAN_H__ */	38	#endif /* __SPARC_MMAN_H__ */