Commit 8aa3c927 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm/mmap: move common defines to mman-common.h 

Two architecture that use arch specific MMAP flags are powerpc and
sparc.  We still have few flag values common across them and other
architectures.  Consolidate this in mman-common.h.

Also update the comment to indicate where to find HugeTLB specific
reserved values

Link: http://lkml.kernel.org/r/20190604090950.31417-1-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22fcea6f

arch/powerpc/include/uapi/asm/mman.h

+1 −5
Original line number Diff line number Diff line
@@ -21,15 +21,11 @@ 
#define MAP_DENYWRITE	0x0800		/* ETXTBSY */

#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */





#define MCL_CURRENT     0x2000          /* lock all currently mapped pages */

#define MCL_FUTURE      0x4000          /* lock all additions to address space */

#define MCL_ONFAULT	0x8000		/* lock all pages that are faulted in */



#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



/* Override any generic PKEY permission defines */

#define PKEY_DISABLE_EXECUTE   0x4

#undef PKEY_ACCESS_MASK

arch/sparc/include/uapi/asm/mman.h

+0 −6
Original line number Diff line number Diff line
@@ -22,10 +22,4 @@ 
#define MCL_FUTURE      0x4000          /* lock all additions to address space */

#define MCL_ONFAULT	0x8000		/* lock all pages that are faulted in */



#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */





#endif /* _UAPI__SPARC_MMAN_H__ */

include/uapi/asm-generic/mman-common.h

+5 −1
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ 
#define MAP_FIXED	0x10		/* Interpret addr exactly */

#define MAP_ANONYMOUS	0x20		/* don't use a file */



/* 0x0100 - 0x40000 flags are defined in asm-generic/mman.h */

/* 0x0100 - 0x4000 flags are defined in asm-generic/mman.h */

#define MAP_POPULATE		0x008000	/* populate (prefault) pagetables */

#define MAP_NONBLOCK		0x010000	/* do not block on IO */

#define MAP_STACK		0x020000	/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB		0x040000	/* create a huge page mapping */

#define MAP_SYNC		0x080000 /* perform synchronous page faults for the mapping */

#define MAP_FIXED_NOREPLACE	0x100000	/* MAP_FIXED which doesn't unmap underlying mapping */

include/uapi/asm-generic/mman.h

+4 −5
Original line number Diff line number Diff line
@@ -9,12 +9,11 @@ 
#define MAP_EXECUTABLE	0x1000		/* mark it as an executable */

#define MAP_LOCKED	0x2000		/* pages are locked */

#define MAP_NORESERVE	0x4000		/* don't check for reservations */

#define MAP_POPULATE	0x8000		/* populate (prefault) pagetables */

#define MAP_NONBLOCK	0x10000		/* do not block on IO */

#define MAP_STACK	0x20000		/* give out an address that is best suited for process/thread stacks */

#define MAP_HUGETLB	0x40000		/* create a huge page mapping */



/* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */

/*

 * Bits [26:31] are reserved, see asm-generic/hugetlb_encode.h

 * for MAP_HUGETLB usage

 */



#define MCL_CURRENT	1		/* lock all current mappings */

#define MCL_FUTURE	2		/* lock all future mappings */

CRA Git | Maintained and supported by SUSTech CRA and CCSE