add asm-generic/mman.h
PATCH 1/1 add asm-generic/mman.h
How does the following look (against gc3-git)?
asm-alpha/mman.h | 8 +++++--- asm-arm/mman.h | 31 +------------------------------ asm-arm26/mman.h | 31 +------------------------------ asm-cris/mman.h | 31 +------------------------------ asm-frv/mman.h | 31 +------------------------------ asm-generic/mman.h | 37 +++++++++++++++++++++++++++++++++++++ asm-h8300/mman.h | 31 +------------------------------ asm-i386/mman.h | 31 +------------------------------ asm-ia64/mman.h | 31 +------------------------------ asm-m32r/mman.h | 33 ++------------------------------- asm-m68k/mman.h | 31 +------------------------------ asm-mips/mman.h | 22 ++++++++++++---------- asm-parisc/mman.h | 8 +++++--- asm-powerpc/mman.h | 32 ++------------------------------ asm-s390/mman.h | 31 +------------------------------ asm-sh/mman.h | 31 +------------------------------ asm-sparc/mman.h | 31 ++----------------------------- asm-sparc64/mman.h | 31 ++----------------------------- asm-v850/mman.h | 30 +----------------------------- asm-x86_64/mman.h | 30 +----------------------------- asm-xtensa/mman.h | 22 ++++++++++++---------- 21 files changed, 91 insertions(+), 503 deletions(-)
Tested on x86_64.
---
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
include/asm-powerpc/mman.h +2 -30
@@ -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,27 +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 */ -#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_POWERPC_MMAN_H */
include/asm-cris/mman.h +1 -30
@@ -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-arm26/mman.h +1 -30
@@ -1,19 +1,7 @@#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-alpha/mman.h +5 -3
@@ -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-m68k/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __M68K_MMAN_H__#define __M68K_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) 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 /* __M68K_MMAN_H__ */
include/asm-xtensa/mman.h +12 -10
@@ -67,17 +67,19 @@#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 */ +#define MADV_NORMAL 0/* no further special treatment */ +#define MADV_RANDOM 1/* expect random page references */ +#define MADV_SEQUENTIAL 2/* expect sequential page references */ +#define MADV_WILLNEED 3/* will need these pages */ +#define MADV_DONTNEED 4/* don't need these pages */ + +/* common parameters: try to keep these consistent across architectures */ +#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 -#define MAP_FILE 0 +#define MAP_ANON MAP_ANONYMOUS +#define MAP_FILE 0#endif /* _XTENSA_MMAN_H */
include/asm-mips/mman.h +12 -10
@@ -60,17 +60,19 @@#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 */ +#define MADV_NORMAL 0/* no further special treatment */ +#define MADV_RANDOM 1/* expect random page references */ +#define MADV_SEQUENTIAL 2/* expect sequential page references */ +#define MADV_WILLNEED 3/* will need these pages */ +#define MADV_DONTNEED 4/* don't need these pages */ + +/* common parameters: try to keep these consistent across architectures */ +#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 -#define MAP_FILE 0 +#define MAP_ANON MAP_ANONYMOUS +#define MAP_FILE 0#endif /* _ASM_MMAN_H */
include/asm-sparc64/mman.h +2 -29
@@ -2,21 +2,10 @@#ifndef __SPARC64_MMAN_H__#define __SPARC64_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,18 +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 */ -#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 /* __SPARC64_MMAN_H__ */
include/asm-v850/mman.h +1 -29
@@ -1,18 +1,7 @@#ifndef __V850_MMAN_H__#define __V850_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_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 */
@@ -20,24 +9,7 @@#define MAP_LOCKED 0x2000/* pages are locked */ #define MAP_NORESERVE 0x4000/* don't check for reservations */ -#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 /* __V850_MMAN_H__ */
include/asm-s390/mman.h +1 -30
@@ -9,19 +9,7 @@#ifndef __S390_MMAN_H__#define __S390_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 */
@@ -31,24 +19,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 /* __S390_MMAN_H__ */
include/asm-parisc/mman.h +5 -3
@@ -38,7 +38,11 @@#define MADV_SPACEAVAIL 5/* insure that resources are reserved */ #define MADV_VPS_PURGE 6/* Purge pages from VM page cache */ #define MADV_VPS_INHERIT 7/* Inherit parents page size */ -#define MADV_REMOVE 8/* remove these pages & resources */ + +/* 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 */ /* The range 12-64 is reserved for page size specification. */ #define MADV_4K_PAGES 12/* Use 4K pages */
@@ -49,8 +53,6 @@#define MADV_4M_PAGES 22/* Use 4 Megabyte pages */ #define MADV_16M_PAGES 24/* Use 16 Megabyte pages */ #define MADV_64M_PAGES 26/* Use 64 Megabyte pages */ -#define MADV_DONTFORK 0x30/* dont inherit across fork */ -#define MADV_DOFORK 0x31/* do inherit across fork */ /* compatibility flags */ #define MAP_ANON MAP_ANONYMOUS
include/asm-i386/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __I386_MMAN_H__#define __I386_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) 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 /* __I386_MMAN_H__ */
include/asm-sh/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __ASM_SH_MMAN_H#define __ASM_SH_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 /* __ASM_SH_MMAN_H */
include/asm-ia64/mman.h +1 -30
@@ -8,19 +8,7 @@* David Mosberger-Tang <[email protected]>, Hewlett-Packard Co */ -#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 0x00100/* stack-like segment */ #define MAP_GROWSUP 0x00200/* register stack-like segment */
@@ -31,24 +19,7 @@#define MAP_POPULATE 0x08000/* 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_IA64_MMAN_H */
include/asm-generic/mman.h new file +42 -0
42 lines not on this page · raw message
include/asm-sparc/mman.h +2 -29
@@ -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,18 +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 */ -#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 /* __SPARC_MMAN_H__ */
include/asm-m32r/mman.h +2 -31
@@ -1,21 +1,9 @@#ifndef __M32R_MMAN_H__#define __M32R_MMAN_H__ -/* orig : i386 2.6.0-test6 */ - -#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 */ +#include <asm-generic/mman.h> -#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 */ +/* orig : i386 2.6.0-test6 */ #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__ */
include/asm-frv/mman.h +1 -30
@@ -1,19 +1,7 @@#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__ */
include/asm-h8300/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __H8300_MMAN_H__#define __H8300_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) 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 /* __H8300_MMAN_H__ */
include/asm-arm/mman.h +1 -30
@@ -1,19 +1,7 @@#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-x86_64/mman.h +1 -29
@@ -1,19 +1,8 @@#ifndef __X8664_MMAN_H__#define __X8664_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_NONE 0x0/* page can not be accessed */ -#define PROT_SEM 0x8 -#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 */ +#include <asm-generic/mman.h> -#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_32BIT 0x40/* only give out 32bit addresses */ #define MAP_GROWSDOWN 0x0100/* stack-like segment */
@@ -24,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
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoted 1 line · Michael S. Tsirkin
How does the following look (against gc3-git)?
I tried to do the same earlier (while doing MADV_REMOVE) and got ugly (I was trying to completely get rid of asm-specific ones), so I gave up.
Anyway,
Quoted 4 lines
Index:
linux-2.6.16-rc3/include/asm-generic/mman.h
===================================================================include/asm-generic/mman.h new file +0
-0
..
include/asm-generic/mman.h line 25
Quoted 3 lines
include/asm-generic/mman.h new file +3
-0+#define MS_ASYNC 1/* sync memory asynchronously */ +#define MS_SYNC 2/* synchronous memory sync */ +#define MS_INVALIDATE 4/* invalidate the caches */
Shouldn't this be ?
+#define MS_ASYNC 1 /* sync memory asynchronously */
+#define MS_INVALIDATE 2 /* invalidate the caches */
+#define MS_SYNC 4 /* synchronous memory sync */
Thanks,
Badari
Quoting r. Badari Pulavarty <[email protected]>:
Quoted 27 lines
Subject: Re: [PATCH] add
asm-generic/mman.hQuoted 1 line · Michael S. Tsirkin
How does the following look (against gc3-git)?
I tried to do the same earlier (while doing
MADV_REMOVE) and got ugly (I was trying to completely get rid of asm-specific ones), so I gave up.Anyway,
Quoted 4 lines
Index:
linux-2.6.16-rc3/include/asm-generic/mman.h
===================================================================include/asm-generic/mman.h new file +0
-0..
include/asm-generic/mman.h line 25
Quoted 3 lines
include/asm-generic/mman.h new file +3
-0+#define MS_ASYNC 1/* sync memory asynchronously */ +#define MS_SYNC 2/* synchronous memory sync */ +#define MS_INVALIDATE 4/* invalidate the caches */ Shouldn't this be ?
(quoted diff) +3
-0+#define MS_ASYNC 1 /* sync memory asynchronously */ +#define MS_INVALIDATE 2 /* invalidate the caches */ +#define MS_SYNC 4 /* synchronous memory sync */
Quoted 3 lines
Thanks,
Badari
Note that this only looks misaligned in the patch. When you apply, + disappears and numbers get aligned.
Other stuff in asm-xx/mman.h is aligned by tabs and not by spaces, so why should these options be aligned by spaces?
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoted 28 lines · Michael S. Tsirkin
Quoting r. Badari Pulavarty <[email protected]>:
Quoted 27 lines
Subject: Re: [PATCH] add
asm-generic/mman.hQuoted 1 line · Michael S. Tsirkin
How does the following look (against gc3-git)?
I tried to do the same earlier (while doing
MADV_REMOVE) and got ugly (I was trying to completely get rid of asm-specific ones), so I gave up.Anyway,
Quoted 4 lines
Index:
linux-2.6.16-rc3/include/asm-generic/mman.h
===================================================================include/asm-generic/mman.h new file +0
-0..
include/asm-generic/mman.h line 25
Quoted 3 lines
include/asm-generic/mman.h new file +3
-0+#define MS_ASYNC 1/* sync memory asynchronously */ +#define MS_SYNC 2/* synchronous memory sync */ +#define MS_INVALIDATE 4/* invalidate the caches */ Shouldn't this be ?
(quoted diff) +3
-0+#define MS_ASYNC 1 /* sync memory asynchronously */ +#define MS_INVALIDATE 2 /* invalidate the caches */ +#define MS_SYNC 4 /* synchronous memory sync */
Quoted 8 lines
Quoted 3 lines
Thanks,
BadariNote that this only looks misaligned in the patch. When you apply, + disappears and numbers get aligned.
Other stuff inasm-xx/mman.his aligned by tabs and not by spaces, so why should these options be aligned by spaces?
I am not talking about alignment or spaces.
What I meant was ..
MS_SYNC should be 4MS_INVALIDATE should be 2
You got it other way in your patch.
Thanks,
Badari
Quoting r. Badari Pulavarty <[email protected]>:
Quoted 2 lines
MS_SYNCshould be 4MS_INVALIDATEshould be 2
Good catch, thanks!
Other numbers look right, dont they?
---
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
include/asm-powerpc/mman.h +2 -30
@@ -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,27 +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 */ -#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_POWERPC_MMAN_H */
include/asm-cris/mman.h +1 -30
@@ -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-arm26/mman.h +1 -30
@@ -1,19 +1,7 @@#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-alpha/mman.h +5 -3
@@ -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-m68k/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __M68K_MMAN_H__#define __M68K_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) 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 /* __M68K_MMAN_H__ */
include/asm-xtensa/mman.h +12 -10
@@ -67,17 +67,19 @@#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 */ +#define MADV_NORMAL 0/* no further special treatment */ +#define MADV_RANDOM 1/* expect random page references */ +#define MADV_SEQUENTIAL 2/* expect sequential page references */ +#define MADV_WILLNEED 3/* will need these pages */ +#define MADV_DONTNEED 4/* don't need these pages */ + +/* common parameters: try to keep these consistent across architectures */ +#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 -#define MAP_FILE 0 +#define MAP_ANON MAP_ANONYMOUS +#define MAP_FILE 0#endif /* _XTENSA_MMAN_H */
include/asm-mips/mman.h +12 -10
@@ -60,17 +60,19 @@#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 */ +#define MADV_NORMAL 0/* no further special treatment */ +#define MADV_RANDOM 1/* expect random page references */ +#define MADV_SEQUENTIAL 2/* expect sequential page references */ +#define MADV_WILLNEED 3/* will need these pages */ +#define MADV_DONTNEED 4/* don't need these pages */ + +/* common parameters: try to keep these consistent across architectures */ +#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 -#define MAP_FILE 0 +#define MAP_ANON MAP_ANONYMOUS +#define MAP_FILE 0#endif /* _ASM_MMAN_H */
include/asm-sparc64/mman.h +2 -29
@@ -2,21 +2,10 @@#ifndef __SPARC64_MMAN_H__#define __SPARC64_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,18 +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 */ -#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 /* __SPARC64_MMAN_H__ */
include/asm-v850/mman.h +1 -29
@@ -1,18 +1,7 @@#ifndef __V850_MMAN_H__#define __V850_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_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 */
@@ -20,24 +9,7 @@#define MAP_LOCKED 0x2000/* pages are locked */ #define MAP_NORESERVE 0x4000/* don't check for reservations */ -#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 /* __V850_MMAN_H__ */
include/asm-s390/mman.h +1 -30
@@ -9,19 +9,7 @@#ifndef __S390_MMAN_H__#define __S390_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 */
@@ -31,24 +19,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 /* __S390_MMAN_H__ */
include/asm-parisc/mman.h +5 -3
@@ -38,7 +38,11 @@#define MADV_SPACEAVAIL 5/* insure that resources are reserved */ #define MADV_VPS_PURGE 6/* Purge pages from VM page cache */ #define MADV_VPS_INHERIT 7/* Inherit parents page size */ -#define MADV_REMOVE 8/* remove these pages & resources */ + +/* 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 */ /* The range 12-64 is reserved for page size specification. */ #define MADV_4K_PAGES 12/* Use 4K pages */
@@ -49,8 +53,6 @@#define MADV_4M_PAGES 22/* Use 4 Megabyte pages */ #define MADV_16M_PAGES 24/* Use 16 Megabyte pages */ #define MADV_64M_PAGES 26/* Use 64 Megabyte pages */ -#define MADV_DONTFORK 0x30/* dont inherit across fork */ -#define MADV_DOFORK 0x31/* do inherit across fork */ /* compatibility flags */ #define MAP_ANON MAP_ANONYMOUS
include/asm-i386/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __I386_MMAN_H__#define __I386_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) 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 /* __I386_MMAN_H__ */
include/asm-sh/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __ASM_SH_MMAN_H#define __ASM_SH_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 /* __ASM_SH_MMAN_H */
include/asm-ia64/mman.h +1 -30
@@ -8,19 +8,7 @@* David Mosberger-Tang <[email protected]>, Hewlett-Packard Co */ -#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 0x00100/* stack-like segment */ #define MAP_GROWSUP 0x00200/* register stack-like segment */
@@ -31,24 +19,7 @@#define MAP_POPULATE 0x08000/* 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_IA64_MMAN_H */
include/asm-generic/mman.h new file +42 -0
42 lines not on this page · raw message
include/asm-sparc/mman.h +2 -29
@@ -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,18 +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 */ -#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 /* __SPARC_MMAN_H__ */
include/asm-m32r/mman.h +2 -31
@@ -1,21 +1,9 @@#ifndef __M32R_MMAN_H__#define __M32R_MMAN_H__ -/* orig : i386 2.6.0-test6 */ - -#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 */ +#include <asm-generic/mman.h> -#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 */ +/* orig : i386 2.6.0-test6 */ #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__ */
include/asm-frv/mman.h +1 -30
@@ -1,19 +1,7 @@#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__ */
include/asm-h8300/mman.h +1 -30
@@ -1,19 +1,7 @@#ifndef __H8300_MMAN_H__#define __H8300_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) 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 /* __H8300_MMAN_H__ */
include/asm-arm/mman.h +1 -30
@@ -1,19 +1,7 @@#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-x86_64/mman.h +1 -29
@@ -1,19 +1,8 @@#ifndef __X8664_MMAN_H__#define __X8664_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_NONE 0x0/* page can not be accessed */ -#define PROT_SEM 0x8 -#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 */ +#include <asm-generic/mman.h> -#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_32BIT 0x40/* only give out 32bit addresses */ #define MAP_GROWSDOWN 0x0100/* stack-like segment */
@@ -24,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
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoted 7 lines · Michael S. Tsirkin
Quoting r. Badari Pulavarty <[email protected]>:
Quoted 2 lines
MS_SYNCshould be 4MS_INVALIDATEshould be 2Good catch, thanks!
Other numbers look right, dont they?
Yes. Others look good.
BTW, can we decide on this quickly ? This patch actually changes MADV_REMOVE value - which was added recently, so no app should be using it, yet. But a major distro release is basing on current mainline (2.6.16ish). I hate to see distro release having differnt values for MADV_ from mainline - distro's will be stuck maintaining that crap for ever :(
Thanks,
Badari
Quoted 2 lines · Michael S. Tsirkin
Other numbers look right, dont they?
Suggestion: for each macro name, do
grep "macroname" patch
and if you see anything that looks even half-way suspicious, check it.
Here's a pipeline from hell which shows that you broke at least MADV_REMOVE (which has values 5-9 depending on architecture).
sed -n '/^[-+].*define[ ]*/
{ s/.*define[ ]*\([A-Za-z_0-9]*\).*/\1/ ; p}'
patch |
sort -u |
while read i
do
echo $i:
grep "^[-+].*$i" patch
done |
less -SRule #1: use tools instead of eyeballs whenever you possibly can. Humans are bad at noticing changes like this.
Linus
Quoting r. Linus Torvalds <[email protected]>:
Quoted 17 lines
Subject: Re: [PATCH] add
asm-generic/mman.hQuoted 2 lines · Michael S. Tsirkin
Other numbers look right, dont they?
Suggestion: for each macro name, do
grep "macroname" patch
and if you see anything that looks even half-way suspicious, check it.
Here's a pipeline from hell which shows that you broke at least
MADV_REMOVE(which has values 5-9 depending on architecture).
Quoted 10 lines
sed -n '/^[-+].*define[ ]*/
{ s/.*define[ ]*\([A-Za-z_0-9]*\).*/\1/ ; p}'
patch |
sort -u |
while read i
do
echo $i:
grep "^[-+].*$i" patch
done |
less -SThis change was intentional: MADV_REMOVE wasnt in any mainline kernels:
it was added recently, so no app should be using it, yet.
Quoted 2 lines
Rule #1: use tools instead of eyeballs whenever you possibly can. Humans are bad at noticing changes like this.
Right. I'll go check again.
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoted 5 lines · Linus Torvalds
Quoted 2 lines · Michael S. Tsirkin
Other numbers look right, dont they?
Quoted 8 lines
Suggestion: for each macro name, do
grep "macroname" patch
and if you see anything that looks even half-way suspicious, check it.
Here's a pipeline from hell which shows that you broke at least
MADV_REMOVE(which has values 5-9 depending on architecture).
Yes. I did that earlier and checked everything.
MADV_REMOVE is a known change. Since it added very recently, I guess is okay to fix it for real. But if we are going to change it, I am hoping to see it very soon in mainline. (Before distros fork-off).
Thanks,
Badari
Quoting r. Badari Pulavarty <[email protected]>:
Quoted 6 lines
Yes. I did that earlier and checked everything.
MADV_REMOVEis a known change. Since it added very recently, I guess is okay to fix it for real. But if we are going to change it, I am hoping to see it very soon in mainline. (Before distros fork-off).
I agree. Andrew, could take this into -mm?
This replaces Roland's fix-up-madv_dontfork-madv_dofork-definitions.patch
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoting r. Linus Torvalds <[email protected]>:
Quoted 2 lines
Rule #1: use tools instead of eyeballs whenever you possibly can. Humans are bad at noticing changes like this.
OK, this
#!/usr/bin/perl
my %new_values;
my @old_names;
my @old_values;
while (<>)
{
if (m/^\+#define\s+(\S+)\s+(\S+)\s+.*$/) {
$new_values{$1}=$2;
}
if (m/^\-#define\s+(\S+)\s+(\S+)\s+.*$/) {
push @old_names, $1;
push @old_values, $2;
}
}for (my $i = 0; $i <= $#old_values; $i++) {
if (oct($new_values{$old_names[$i]}) != oct($old_values[$i])) {
print "Changed: $old_names[$i] $old_values[$i] " .
" to $new_values{$old_names[$i]}\n";
}
}Shows that the only numbers changed areMADV_REMOVEMADV_DONTFORKMADV_DOFORK
As was intended.
OK now?
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies
Quoted 1 line · Michael S. Tsirkin
How does the following look (against gc3-git)?
Fine by me.
Linus Torvalds
NAKQuoted 2 lines · Michael S. Tsirkin
How does the following look (against gc3-git)?
NACK!
This changes the values, and the values are visible to user space.
Different architectures really _do_ have different values, even if (a) it's sad and unnecessary and (b) 99% of all apps will never use these values and thus never care.
You've changed MS_INVALIDATE from 2 to 4 here.
Linus
Quoting r. Linus Torvalds <[email protected]>:
Quoted 1 line
You've changed
MS_INVALIDATEfrom 2 to 4 here.
It was just a typo, sorry.
I've just resent it with MS_INVALIDATE fixed to 4.
Signature · 2 lines
Michael S. Tsirkin Staff Engineer, Mellanox Technologies