The patch titled
Subject: mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix
has been removed from the -mm tree. Its filename was
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
This patch was dropped because it was folded into mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix
expand compact_zone_counters_init() into its single callsite, per mhocko
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Yafang Shao <laoar.shao@xxxxxxxxx>
Cc: Yafang Shao <shaoyafang@xxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/compaction.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
--- a/mm/compaction.c~mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix
+++ a/mm/compaction.c
@@ -2068,19 +2068,6 @@ bool compaction_zonelist_suitable(struct
return false;
}
-
-/*
- * Bellow counters are used to track activities during compacting a zone.
- * Before compacting a new zone, we should init these counters first.
- */
-static void compact_zone_counters_init(struct compact_control *cc)
-{
- cc->total_migrate_scanned = 0;
- cc->total_free_scanned = 0;
- cc->nr_migratepages = 0;
- cc->nr_freepages = 0;
-}
-
static enum compact_result
compact_zone(struct compact_control *cc, struct capture_control *capc)
{
@@ -2091,7 +2078,15 @@ compact_zone(struct compact_control *cc,
const bool sync = cc->mode != MIGRATE_ASYNC;
bool update_cached;
- compact_zone_counters_init(cc);
+ /*
+ * These counters track activities during zone compaction. Initialize
+ * them before compacting a new zone.
+ */
+ cc->total_migrate_scanned = 0;
+ cc->total_free_scanned = 0;
+ cc->nr_migratepages = 0;
+ cc->nr_freepages = 0;
+
cc->migratetype = gfpflags_to_migratetype(cc->gfp_mask);
ret = compaction_suitable(cc->zone, cc->order, cc->alloc_flags,
cc->classzone_idx);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
memcg-kmem-deprecate-kmemlimit_in_bytes-fix.patch
mm-mmapc-refine-find_vma_prev-with-rb_last-fix.patch
