diff options
Diffstat (limited to 'mm/compaction.c')
-rw-r--r-- | mm/compaction.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index b9cf751cc00e..7c687c0eef6e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c | |||
@@ -1242,7 +1242,7 @@ static unsigned long compact_zone_order(struct zone *zone, int order, | |||
1242 | .nr_freepages = 0, | 1242 | .nr_freepages = 0, |
1243 | .nr_migratepages = 0, | 1243 | .nr_migratepages = 0, |
1244 | .order = order, | 1244 | .order = order, |
1245 | .migratetype = allocflags_to_migratetype(gfp_mask), | 1245 | .migratetype = gfpflags_to_migratetype(gfp_mask), |
1246 | .zone = zone, | 1246 | .zone = zone, |
1247 | .mode = mode, | 1247 | .mode = mode, |
1248 | }; | 1248 | }; |
@@ -1294,7 +1294,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist, | |||
1294 | return COMPACT_SKIPPED; | 1294 | return COMPACT_SKIPPED; |
1295 | 1295 | ||
1296 | #ifdef CONFIG_CMA | 1296 | #ifdef CONFIG_CMA |
1297 | if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) | 1297 | if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) |
1298 | alloc_flags |= ALLOC_CMA; | 1298 | alloc_flags |= ALLOC_CMA; |
1299 | #endif | 1299 | #endif |
1300 | /* Compact each zone in the list */ | 1300 | /* Compact each zone in the list */ |