diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-15 04:36:31 +0100 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-15 04:36:31 +0100 |
commit | 0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch) | |
tree | 528681b043e947cfc51527d56098f586b6dfa217 /include/asm-h8300/mman.h | |
parent | [CIFS] SessionSetup cleanup part 2 (diff) | |
parent | [PATCH] neofb: avoid resetting display config on unblank (diff) | |
download | linux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.tar.xz linux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-h8300/mman.h')
-rw-r--r-- | include/asm-h8300/mman.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-h8300/mman.h b/include/asm-h8300/mman.h index 744a8fb485c2..ac0346f7d11d 100644 --- a/include/asm-h8300/mman.h +++ b/include/asm-h8300/mman.h @@ -36,6 +36,8 @@ #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 |