diff options
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2d34cdb70f1d..8a0f33624335 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -7399,6 +7399,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, | |||
| 7399 | * #MIGRATE_MOVABLE or #MIGRATE_CMA). All pageblocks | 7399 | * #MIGRATE_MOVABLE or #MIGRATE_CMA). All pageblocks |
| 7400 | * in range must have the same migratetype and it must | 7400 | * in range must have the same migratetype and it must |
| 7401 | * be either of the two. | 7401 | * be either of the two. |
| 7402 | * @gfp_mask: GFP mask to use during compaction | ||
| 7402 | * | 7403 | * |
| 7403 | * The PFN range does not have to be pageblock or MAX_ORDER_NR_PAGES | 7404 | * The PFN range does not have to be pageblock or MAX_ORDER_NR_PAGES |
| 7404 | * aligned, however it's the caller's responsibility to guarantee that | 7405 | * aligned, however it's the caller's responsibility to guarantee that |
| @@ -7412,7 +7413,7 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, | |||
| 7412 | * need to be freed with free_contig_range(). | 7413 | * need to be freed with free_contig_range(). |
| 7413 | */ | 7414 | */ |
| 7414 | int alloc_contig_range(unsigned long start, unsigned long end, | 7415 | int alloc_contig_range(unsigned long start, unsigned long end, |
| 7415 | unsigned migratetype) | 7416 | unsigned migratetype, gfp_t gfp_mask) |
| 7416 | { | 7417 | { |
| 7417 | unsigned long outer_start, outer_end; | 7418 | unsigned long outer_start, outer_end; |
| 7418 | unsigned int order; | 7419 | unsigned int order; |
| @@ -7424,7 +7425,7 @@ int alloc_contig_range(unsigned long start, unsigned long end, | |||
| 7424 | .zone = page_zone(pfn_to_page(start)), | 7425 | .zone = page_zone(pfn_to_page(start)), |
| 7425 | .mode = MIGRATE_SYNC, | 7426 | .mode = MIGRATE_SYNC, |
| 7426 | .ignore_skip_hint = true, | 7427 | .ignore_skip_hint = true, |
| 7427 | .gfp_mask = GFP_KERNEL, | 7428 | .gfp_mask = memalloc_noio_flags(gfp_mask), |
| 7428 | }; | 7429 | }; |
| 7429 | INIT_LIST_HEAD(&cc.migratepages); | 7430 | INIT_LIST_HEAD(&cc.migratepages); |
| 7430 | 7431 | ||
