scsi: cxgb4i: Fix TLS dependency

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

diff --git a/mm/compaction.c b/mm/compaction.c
index 6c63844..6e0ee56 100644 (file)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -625,7 +625,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
                }
 
                /* Found a free page, will break it into order-0 pages */
-               order = page_order(page);
+               order = buddy_order(page);
                isolated = __isolate_free_page(page, order);
                if (!isolated)
                        break;
@@ -898,7 +898,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
                 * potential isolation targets.
                 */
                if (PageBuddy(page)) {
-                       unsigned long freepage_order = page_order_unsafe(page);
+                       unsigned long freepage_order = buddy_order_unsafe(page);
 
                        /*
                         * Without lock, we cannot be sure that what we got is
@@ -1172,7 +1172,7 @@ static bool suitable_migration_target(struct compact_control *cc,
                 * the only small danger is that we skip a potentially suitable
                 * pageblock, so it's not worth to check order for valid range.
                 */
-               if (page_order_unsafe(page) >= pageblock_order)
+               if (buddy_order_unsafe(page) >= pageblock_order)
                        return false;
        }