diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-18 13:24:12 +1000 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 13:12:57 -0700 |
| commit | dcce284a259373f9e5570f2e33f79eca84fcf565 (patch) | |
| tree | afc4b23208974f17c080ea3d2ecfbaca4254c010 /mm/page_alloc.c | |
| parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
| download | linux-dev-dcce284a259373f9e5570f2e33f79eca84fcf565.tar.xz linux-dev-dcce284a259373f9e5570f2e33f79eca84fcf565.zip | |
mm: Extend gfp masking to the page allocator
The page allocator also needs the masking of gfp flags during boot,
so this moves it out of slab/slub and uses it with the page allocator
as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a5f3c278c573..6f0753fe694c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -73,6 +73,7 @@ unsigned long totalram_pages __read_mostly; unsigned long totalreserve_pages __read_mostly; unsigned long highest_memmap_pfn __read_mostly; int percpu_pagelist_fraction; +gfp_t gfp_allowed_mask __read_mostly = GFP_BOOT_MASK; #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE int pageblock_order __read_mostly; @@ -1863,6 +1864,8 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, struct page *page; int migratetype = allocflags_to_migratetype(gfp_mask); + gfp_mask &= gfp_allowed_mask; + lockdep_trace_alloc(gfp_mask); might_sleep_if(gfp_mask & __GFP_WAIT); |