Commit 5f6164f3 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Linus Torvalds
Browse files

[PATCH] add asm-generic/mman.h 



Make new MADV_REMOVE, MADV_DONTFORK, MADV_DOFORK consistent across all
arches.  The idea is to make it possible to use them portably even before
distros include them in libc headers.

Move common flags to asm-generic/mman.h

Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 06fed338

include/asm-alpha/mman.h

+5 −3
Original line number Diff line number Diff line
@@ -42,9 +42,11 @@ 
#define MADV_WILLNEED	3		/* will need these pages */

#define	MADV_SPACEAVAIL	5		/* ensure resources are available */

#define MADV_DONTNEED	6		/* don't need these pages */

#define MADV_REMOVE	7		/* remove these pages & resources */

#define MADV_DONTFORK	0x30		/* dont inherit across fork */

#define MADV_DOFORK	0x31		/* do inherit across fork */



/* common/generic parameters */

#define MADV_REMOVE	9		/* remove these pages & resources */

#define MADV_DONTFORK	10		/* don't inherit across fork */

#define MADV_DOFORK	11		/* do inherit across fork */



/* compatibility flags */

#define MAP_ANON	MAP_ANONYMOUS

include/asm-arm/mman.h

+1 −30
Original line number Diff line number Diff line 
#ifndef __ARM_MMAN_H__

#define __ARM_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 */

#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 */

#include <asm-generic/mman.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */
@@ -23,24 +11,7 @@ 
#define MAP_POPULATE	0x8000		/* populate (prefault) page tables */

#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 /* __ARM_MMAN_H__ */

include/asm-arm26/mman.h

+1 −30
Original line number Diff line number Diff line 
#ifndef __ARM_MMAN_H__

#define __ARM_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 */

#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 */

#include <asm-generic/mman.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */
@@ -23,24 +11,7 @@ 
#define MAP_POPULATE    0x8000          /* populate (prefault) page tables */

#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 /* __ARM_MMAN_H__ */

include/asm-cris/mman.h

+1 −30
Original line number Diff line number Diff line
@@ -3,19 +3,7 @@ 


/* verbatim copy of asm-i386/ 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 */

#include <asm-generic/mman.h>



#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 /* __CRIS_MMAN_H__ */

include/asm-frv/mman.h

+1 −30
Original line number Diff line number Diff line 
#ifndef __ASM_MMAN_H__

#define __ASM_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 */

#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 */

#include <asm-generic/mman.h>



#define MAP_GROWSDOWN	0x0100		/* stack-like segment */

#define MAP_DENYWRITE	0x0800		/* ETXTBSY */
@@ -23,25 +11,8 @@ 
#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 /* __ASM_MMAN_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE