diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /include/linux/gfp.h | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'include/linux/gfp.h')
| -rw-r--r-- | include/linux/gfp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3885e7f75562..80e14b8c2e78 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
| @@ -97,6 +97,9 @@ struct vm_area_struct; | |||
| 97 | __GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\ | 97 | __GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\ |
| 98 | __GFP_NORETRY|__GFP_NOMEMALLOC) | 98 | __GFP_NORETRY|__GFP_NOMEMALLOC) |
| 99 | 99 | ||
| 100 | /* Control slab gfp mask during early boot */ | ||
| 101 | #define SLAB_GFP_BOOT_MASK __GFP_BITS_MASK & ~(__GFP_WAIT|__GFP_IO|__GFP_FS) | ||
| 102 | |||
| 100 | /* Control allocation constraints */ | 103 | /* Control allocation constraints */ |
| 101 | #define GFP_CONSTRAINT_MASK (__GFP_HARDWALL|__GFP_THISNODE) | 104 | #define GFP_CONSTRAINT_MASK (__GFP_HARDWALL|__GFP_THISNODE) |
| 102 | 105 | ||