Since compact_control->order and compact_control->search_order have been modified to unsigned int in the previous commit, then some of the functions in compaction.c are modified accordingly.
Signed-off-by: Pengfei Li <[email protected]> --- include/linux/compaction.h | 12 ++++++------ mm/compaction.c | 21 ++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 9569e7c786d3..0201dfa57d44 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -96,8 +96,8 @@ extern enum compact_result try_to_compact_pages(gfp_t gfp_mask, const struct alloc_context *ac, enum compact_priority prio, struct page **page); extern void reset_isolation_suitable(pg_data_t *pgdat); -extern enum compact_result compaction_suitable(struct zone *zone, int order, - unsigned int alloc_flags, int classzone_idx); +extern enum compact_result compaction_suitable(struct zone *zone, + unsigned int order, unsigned int alloc_flags, int classzone_idx); extern void defer_compaction(struct zone *zone, int order); extern bool compaction_deferred(struct zone *zone, int order); @@ -170,8 +170,8 @@ static inline bool compaction_withdrawn(enum compact_result result) } -bool compaction_zonelist_suitable(struct alloc_context *ac, int order, - int alloc_flags); +bool compaction_zonelist_suitable(struct alloc_context *ac, + unsigned int order, int alloc_flags); extern int kcompactd_run(int nid); extern void kcompactd_stop(int nid); @@ -182,8 +182,8 @@ static inline void reset_isolation_suitable(pg_data_t *pgdat) { } -static inline enum compact_result compaction_suitable(struct zone *zone, int order, - int alloc_flags, int classzone_idx) +static inline enum compact_result compaction_suitable(struct zone *zone, + unsigned int order, int alloc_flags, int classzone_idx) { return COMPACT_SKIPPED; } diff --git a/mm/compaction.c b/mm/compaction.c index e47d8fa943a6..ac5df82d46e0 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1639,7 +1639,7 @@ static unsigned long fast_find_migrateblock(struct compact_control *cc) unsigned long distance; unsigned long pfn = cc->migrate_pfn; unsigned long high_pfn; - int order; + unsigned int order; /* Skip hints are relied on to avoid repeats on the fast search */ if (cc->ignore_skip_hint) @@ -1958,10 +1958,9 @@ static enum compact_result compact_finished(struct compact_control *cc) * COMPACT_SUCCESS - If the allocation would succeed without compaction * COMPACT_CONTINUE - If compaction should run now */ -static enum compact_result __compaction_suitable(struct zone *zone, int order, - unsigned int alloc_flags, - int classzone_idx, - unsigned long wmark_target) +static enum compact_result __compaction_suitable(struct zone *zone, + unsigned int order, unsigned int alloc_flags, + int classzone_idx, unsigned long wmark_target) { unsigned long watermark; @@ -1998,7 +1997,7 @@ static enum compact_result __compaction_suitable(struct zone *zone, int order, return COMPACT_CONTINUE; } -enum compact_result compaction_suitable(struct zone *zone, int order, +enum compact_result compaction_suitable(struct zone *zone, unsigned int order, unsigned int alloc_flags, int classzone_idx) { @@ -2036,7 +2035,7 @@ enum compact_result compaction_suitable(struct zone *zone, int order, return ret; } -bool compaction_zonelist_suitable(struct alloc_context *ac, int order, +bool compaction_zonelist_suitable(struct alloc_context *ac, unsigned int order, int alloc_flags) { struct zone *zone; @@ -2278,10 +2277,10 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) return ret; } -static enum compact_result compact_zone_order(struct zone *zone, int order, - gfp_t gfp_mask, enum compact_priority prio, - unsigned int alloc_flags, int classzone_idx, - struct page **capture) +static enum compact_result compact_zone_order(struct zone *zone, + unsigned int order, gfp_t gfp_mask, + enum compact_priority prio, unsigned int alloc_flags, + int classzone_idx, struct page **capture) { enum compact_result ret; struct compact_control cc = { -- 2.21.0
