On Fri, Jun 20, 2014 at 05:49:40PM +0200, Vlastimil Babka wrote: > From: David Rientjes <[email protected]> > > The page allocator has gfp flags (like __GFP_WAIT) and alloc flags (like > ALLOC_CPUSET) that have separate semantics. > > The function allocflags_to_migratetype() actually takes gfp flags, not alloc > flags, and returns a migratetype. Rename it to gfpflags_to_migratetype(). > > Signed-off-by: David Rientjes <[email protected]> > Signed-off-by: Vlastimil Babka <[email protected]> > Reviewed-by: Zhang Yanfei <[email protected]> > Acked-by: Minchan Kim <[email protected]> > Cc: Mel Gorman <[email protected]> > Cc: Joonsoo Kim <[email protected]> > Cc: Michal Nazarewicz <[email protected]> > Cc: Naoya Horiguchi <[email protected]> > Cc: Christoph Lameter <[email protected]> > Cc: Rik van Riel <[email protected]>
Reviewed-by: Naoya Horiguchi <[email protected]> > --- > include/linux/gfp.h | 2 +- > mm/compaction.c | 4 ++-- > mm/page_alloc.c | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index 5e7219d..41b30fd 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -156,7 +156,7 @@ struct vm_area_struct; > #define GFP_DMA32 __GFP_DMA32 > > /* Convert GFP flags to their corresponding migrate type */ > -static inline int allocflags_to_migratetype(gfp_t gfp_flags) > +static inline int gfpflags_to_migratetype(const gfp_t gfp_flags) > { > WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK); > > diff --git a/mm/compaction.c b/mm/compaction.c > index df0961b..32c768b 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -1185,7 +1185,7 @@ static unsigned long compact_zone_order(struct zone > *zone, int order, > .nr_freepages = 0, > .nr_migratepages = 0, > .order = order, > - .migratetype = allocflags_to_migratetype(gfp_mask), > + .migratetype = gfpflags_to_migratetype(gfp_mask), > .zone = zone, > .mode = mode, > }; > @@ -1237,7 +1237,7 @@ unsigned long try_to_compact_pages(struct zonelist > *zonelist, > > *deferred = true; > #ifdef CONFIG_CMA > - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > alloc_flags |= ALLOC_CMA; > #endif > /* Compact each zone in the list */ > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 6593f79..70b8297 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -2473,7 +2473,7 @@ gfp_to_alloc_flags(gfp_t gfp_mask) > alloc_flags |= ALLOC_NO_WATERMARKS; > } > #ifdef CONFIG_CMA > - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > alloc_flags |= ALLOC_CMA; > #endif > return alloc_flags; > @@ -2716,7 +2716,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int > order, > struct zone *preferred_zone; > struct zoneref *preferred_zoneref; > struct page *page = NULL; > - int migratetype = allocflags_to_migratetype(gfp_mask); > + int migratetype = gfpflags_to_migratetype(gfp_mask); > unsigned int cpuset_mems_cookie; > int alloc_flags = ALLOC_WMARK_LOW|ALLOC_CPUSET|ALLOC_FAIR; > int classzone_idx; > @@ -2750,7 +2750,7 @@ retry_cpuset: > classzone_idx = zonelist_zone_idx(preferred_zoneref); > > #ifdef CONFIG_CMA > - if (allocflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > + if (gfpflags_to_migratetype(gfp_mask) == MIGRATE_MOVABLE) > alloc_flags |= ALLOC_CMA; > #endif > retry: > -- > 1.8.4.5 > > -- > To unsubscribe, send a message with 'unsubscribe linux-mm' in > the body to [email protected]. For more info on Linux MM, > see: http://www.linux-mm.org/ . > Don't email: <a href=mailto:"[email protected]";> [email protected] </a> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
