Commit 8b94e0b8 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds
Browse files

mm/page_alloc: remove a wrapper for alloc_migration_target() 



There is a well-defined standard migration target callback.  Use it
directly.

Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Roman Gushchin <guro@fb.com>
Link: http://lkml.kernel.org/r/1594622517-20681-8-git-send-email-iamjoonsoo.kim@lge.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0976311

mm/page_alloc.c

+6 −2
Original line number Diff line number Diff line
@@ -8347,6 +8347,10 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
	unsigned long pfn = start;

	unsigned int tries = 0;

	int ret = 0;

	struct migration_target_control mtc = {

		.nid = zone_to_nid(cc->zone),

		.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,

	};



	migrate_prep();
@@ -8373,8 +8377,8 @@ static int __alloc_contig_migrate_range(struct compact_control *cc, 
							&cc->migratepages);

		cc->nr_migratepages -= nr_reclaimed;



		ret = migrate_pages(&cc->migratepages, alloc_migrate_target,

				    NULL, 0, cc->mode, MR_CONTIG_RANGE);

		ret = migrate_pages(&cc->migratepages, alloc_migration_target,

				NULL, (unsigned long)&mtc, cc->mode, MR_CONTIG_RANGE);

	}

	if (ret < 0) {

		putback_movable_pages(&cc->migratepages);

mm/page_isolation.c

+0 −10
Original line number Diff line number Diff line
@@ -306,13 +306,3 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, 


	return pfn < end_pfn ? -EBUSY : 0;

}
 


struct page *alloc_migrate_target(struct page *page, unsigned long private)

{

	struct migration_target_control mtc = {

		.nid = page_to_nid(page),

		.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,

	};



	return alloc_migration_target(page, (unsigned long)&mtc);

}