Skip to content

Commit 80e0d14

Browse files
committed
mm/compaction: rename 'start_pfn' to 'iteration_start_pfn' in compact_zone()
jira LE-4623 Rebuild_History Non-Buildable kernel-4.18.0-553.81.1.el8_10 commit-author Yanfei Xu <yanfei.xu@windriver.com> commit 19d3cf9 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. Link: https://lkml.kernel.org/r/20201019115044.1571-1-yanfei.xu@windriver.com Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Acked-by: Pankaj Gupta <pankaj.gupta.linux@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> (cherry picked from commit 19d3cf9) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 58f17f6 commit 80e0d14

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

mm/compaction.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,7 +2317,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
23172317

23182318
while ((ret = compact_finished(cc)) == COMPACT_CONTINUE) {
23192319
int err;
2320-
unsigned long start_pfn = cc->migrate_pfn;
2320+
unsigned long iteration_start_pfn = cc->migrate_pfn;
23212321

23222322
/*
23232323
* Avoid multiple rescans which can happen if a page cannot be
@@ -2329,7 +2329,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
23292329
*/
23302330
cc->rescan = false;
23312331
if (pageblock_start_pfn(last_migrated_pfn) ==
2332-
pageblock_start_pfn(start_pfn)) {
2332+
pageblock_start_pfn(iteration_start_pfn)) {
23332333
cc->rescan = true;
23342334
}
23352335

@@ -2353,8 +2353,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
23532353
goto check_drain;
23542354
case ISOLATE_SUCCESS:
23552355
update_cached = false;
2356-
last_migrated_pfn = start_pfn;
2357-
;
2356+
last_migrated_pfn = iteration_start_pfn;
23582357
}
23592358

23602359
err = migrate_pages(&cc->migratepages, compaction_alloc,

0 commit comments

Comments
 (0)