mm-compaction-rename-start_pfn-to-iteration_start_pfn-in-compact_zone.patch removed from -mm tree
The patch titled
Subject: mm/compaction: rename 'start_pfn' to 'iteration_start_pfn' in compact_zone()
has been removed from the -mm tree. Its filename was
mm-compaction-rename-start_pfn-to-iteration_start_pfn-in-compact_zone.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yanfei Xu <[email protected]>
Subject: mm/compaction: rename 'start_pfn' to 'iteration_start_pfn' in compact_zone()
There are two 'start_pfn' declared in compact_zone() which have different meanings. Rename the second one to 'iteration_start_pfn' to prevent confusion.
Also, remove an useless semicolon.
Signed-off-by Yanfei Xu <[email protected]>
Acked-by Vlastimil Babka <[email protected]>
Acked-by Pankaj Gupta <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/compaction.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
mm/compaction.c renamed from mm/compaction.c~mm-compaction-rename-start_pfn-to-iteration_start_pfn-in-compact_zone +3 -4
@@ -2275,7 +2275,7 @@ compact_zone(struct compact_control *cc,while ((ret =compact_finished (cc)) ==COMPACT_CONTINUE ) {int err; -unsigned long start_pfn = cc->migrate_pfn; +unsigned long iteration_start_pfn = cc->migrate_pfn;/* * Avoid multiple rescans which can happen if a page cannot be
@@ -2287,7 +2287,7 @@ compact_zone(struct compact_control *cc,*/ cc->rescan = false;if (pageblock_start_pfn (last_migrated_pfn) == -pageblock_start_pfn (start_pfn)) { +pageblock_start_pfn (iteration_start_pfn)) { cc->rescan = true; }
@@ -2311,8 +2311,7 @@ compact_zone(struct compact_control *cc, goto check_drain;case ISOLATE_SUCCESS : update_cached = false; - last_migrated_pfn = start_pfn; - ; + last_migrated_pfn = iteration_start_pfn; } err = migrate_pages(&cc->migratepages, compaction_alloc,
_
Patches currently in -mm which might be from [email protected] are