Merge git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-block.git] / include / linux / migrate.h

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index ab45f8a0d288ab03665e2d88a075c0479c76318d..f2b4abbca55e75f82c55dd6b8f7771d54738a23b 100644 (file)
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -7,8 +7,7 @@
 #include <linux/migrate_mode.h>
 #include <linux/hugetlb.h>
 
-typedef struct page *new_page_t(struct page *page, unsigned long private,
-                               int **reason);
+typedef struct page *new_page_t(struct page *page, unsigned long private);
 typedef void free_page_t(struct page *page, unsigned long private);
 
 /*
@@ -43,9 +42,9 @@ static inline struct page *new_page_nodemask(struct page *page,
                return alloc_huge_page_nodemask(page_hstate(compound_head(page)),
                                preferred_nid, nodemask);
 
-       if (thp_migration_supported() && PageTransHuge(page)) {
-               order = HPAGE_PMD_ORDER;
+       if (PageTransHuge(page)) {
                gfp_mask |= GFP_TRANSHUGE;
+               order = HPAGE_PMD_ORDER;
        }
 
        if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))