|
@@ -2523,7 +2523,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask)
|
|
alloc_flags |= ALLOC_NO_WATERMARKS;
|
|
alloc_flags |= ALLOC_NO_WATERMARKS;
|
|
}
|
|
}
|
|
#ifdef CONFIG_CMA
|
|
#ifdef CONFIG_CMA
|
|
- if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
|
|
|
|
|
|
+ if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE)
|
|
alloc_flags |= ALLOC_CMA;
|
|
alloc_flags |= ALLOC_CMA;
|
|
#endif
|
|
#endif
|
|
return alloc_flags;
|
|
return alloc_flags;
|
|
@@ -2786,7 +2786,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
|
|
struct zone *preferred_zone;
|
|
struct zone *preferred_zone;
|
|
struct zoneref *preferred_zoneref;
|
|
struct zoneref *preferred_zoneref;
|
|
struct page *page = NULL;
|
|
struct page *page = NULL;
|
|
- int migratetype = allocflags_to_migratetype(gfp_mask);
|
|
|
|
|
|
+ int migratetype = gfpflags_to_migratetype(gfp_mask);
|
|
unsigned int cpuset_mems_cookie;
|
|
unsigned int cpuset_mems_cookie;
|
|
int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR;
|
|
int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR;
|
|
int classzone_idx;
|
|
int classzone_idx;
|