diff options
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 313338d74095..f07588b11d59 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -2523,7 +2523,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) | |||
2523 | alloc_flags |= ALLOC_NO_WATERMARKS; | 2523 | alloc_flags |= ALLOC_NO_WATERMARKS; |
2524 | } | 2524 | } |
2525 | #ifdef CONFIG_CMA | 2525 | #ifdef CONFIG_CMA |
2526 | if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) | 2526 | if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) |
2527 | alloc_flags |= ALLOC_CMA; | 2527 | alloc_flags |= ALLOC_CMA; |
2528 | #endif | 2528 | #endif |
2529 | return alloc_flags; | 2529 | return alloc_flags; |
@@ -2786,7 +2786,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order, | |||
2786 | struct zone *preferred_zone; | 2786 | struct zone *preferred_zone; |
2787 | struct zoneref *preferred_zoneref; | 2787 | struct zoneref *preferred_zoneref; |
2788 | struct page *page = NULL; | 2788 | struct page *page = NULL; |
2789 | int migratetype = allocflags_to_migratetype(gfp_mask); | 2789 | int migratetype = gfpflags_to_migratetype(gfp_mask); |
2790 | unsigned int cpuset_mems_cookie; | 2790 | unsigned int cpuset_mems_cookie; |
2791 | int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR; | 2791 | int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR; |
2792 | int classzone_idx; | 2792 | int classzone_idx; |