Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[linux-2.6-block.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index e2e8014fb75548bfca8c720e39fd79f5328d9533..457bde530cbedcf0dea2f35e219466de0acf204d 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1373,7 +1373,7 @@ static unsigned long scan_movable_pages(unsigned long start, unsigned long end)
                        if (PageLRU(page))
                                return pfn;
                        if (PageHuge(page)) {
-                               if (is_hugepage_active(page))
+                               if (page_huge_active(page))
                                        return pfn;
                                else
                                        pfn = round_up(pfn + 1,