Merge tag 'gvt-fixes-2017-08-23' of https://github.com/01org/gvt-linux into drm-intel...

[linux-2.6-microblaze.git] / mm / compaction.c

diff --git a/mm/compaction.c b/mm/compaction.c
index 613c59e..fb548e4 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -236,10 +236,9 @@ static void __reset_isolation_suitable(struct zone *zone)
 
                cond_resched();
 
-               if (!pfn_valid(pfn))
+               page = pfn_to_online_page(pfn);
+               if (!page)
                        continue;
-
-               page = pfn_to_page(pfn);
                if (zone != page_zone(page))
                        continue;