has_unmovable_pages() does alreay check whether the hugetlb page supports migration, so all non-migrateable hugetlb pages should have been caught there. Let us drop the check from scan_movable_pages() as is redundant. Signed-off-by: Oscar Salvador <osalvador@xxxxxxx> Acked-by: Michal Hocko <mhocko@xxxxxxxx> Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> --- mm/memory_hotplug.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 02283732544e..37a83a83e8f8 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1340,8 +1340,7 @@ static unsigned long scan_movable_pages(unsigned long start, unsigned long end) if (!PageHuge(page)) continue; head = compound_head(page); - if (hugepage_migration_supported(page_hstate(head)) && - page_huge_active(head)) + if (page_huge_active(head)) return pfn; skip = (1 << compound_order(head)) - (page - head); pfn += skip - 1; -- 2.13.7
