1 files changed, 2 insertions, 1 deletions

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 9eea6e809a4e..38d94b703e9d 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1333,7 +1333,8 @@ static unsigned long scan_movable_pages(unsigned long start, unsigned long end)
                         if (__PageMovable(page))
                                 return pfn;
                         if (PageHuge(page)) {
-                                if (page_huge_active(page))
+                                if (hugepage_migration_supported(page_hstate(page)) &&
+                                    page_huge_active(page))
                                         return pfn;
                                 else
                                         pfn = round_up(pfn + 1,