diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-03-13 23:36:52 -0500 |
| commit | 58a343f22e8ef987b90e34bbef7f1455e3bb5a15 (patch) | |
| tree | fc811fb570639f2083df6d9191b6a8d7cff65352 /include/asm-parisc | |
| parent | 51c38f9bce274a1e8a90aa457fb433be738f7458 (diff) | |
| parent | 3759fa9c55923f719ae944a3f8fbb029b36f759d (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-parisc')
| -rw-r--r-- | include/asm-parisc/mman.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-parisc/mman.h b/include/asm-parisc/mman.h index a381cf5c8f55..0ef15ee0f17e 100644 --- a/include/asm-parisc/mman.h +++ b/include/asm-parisc/mman.h | |||
| @@ -38,7 +38,11 @@ | |||
| 38 | #define MADV_SPACEAVAIL 5 /* insure that resources are reserved */ | 38 | #define MADV_SPACEAVAIL 5 /* insure that resources are reserved */ |
| 39 | #define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */ | 39 | #define MADV_VPS_PURGE 6 /* Purge pages from VM page cache */ |
| 40 | #define MADV_VPS_INHERIT 7 /* Inherit parents page size */ | 40 | #define MADV_VPS_INHERIT 7 /* Inherit parents page size */ |
| 41 | #define MADV_REMOVE 8 /* remove these pages & resources */ | 41 | |
| 42 | /* common/generic parameters */ | ||
| 43 | #define MADV_REMOVE 9 /* remove these pages & resources */ | ||
| 44 | #define MADV_DONTFORK 10 /* don't inherit across fork */ | ||
| 45 | #define MADV_DOFORK 11 /* do inherit across fork */ | ||
| 42 | 46 | ||
| 43 | /* The range 12-64 is reserved for page size specification. */ | 47 | /* The range 12-64 is reserved for page size specification. */ |
| 44 | #define MADV_4K_PAGES 12 /* Use 4K pages */ | 48 | #define MADV_4K_PAGES 12 /* Use 4K pages */ |
| @@ -49,8 +53,6 @@ | |||
| 49 | #define MADV_4M_PAGES 22 /* Use 4 Megabyte pages */ | 53 | #define MADV_4M_PAGES 22 /* Use 4 Megabyte pages */ |
| 50 | #define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ | 54 | #define MADV_16M_PAGES 24 /* Use 16 Megabyte pages */ |
| 51 | #define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ | 55 | #define MADV_64M_PAGES 26 /* Use 64 Megabyte pages */ |
| 52 | #define MADV_DONTFORK 0x30 /* dont inherit across fork */ | ||
| 53 | #define MADV_DOFORK 0x31 /* do inherit across fork */ | ||
| 54 | 56 | ||
| 55 | /* compatibility flags */ | 57 | /* compatibility flags */ |
| 56 | #define MAP_ANON MAP_ANONYMOUS | 58 | #define MAP_ANON MAP_ANONYMOUS |