1 files changed, 19 insertions, 8 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ff5484fdbdf9..3334a769eb91 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -670,6 +670,7 @@ out:
 
 void free_compound_page(struct page *page)
 {
+        mem_cgroup_uncharge(page);
         __free_pages_ok(page, compound_order(page));
 }
 
@@ -3955,14 +3956,22 @@ should_compact_retry(struct alloc_context *ac, int order, int alloc_flags,
                 goto check_priority;
 
         /*
+         * compaction was skipped because there are not enough order-0 pages
+         * to work with, so we retry only if it looks like reclaim can help.
+         */
+        if (compaction_needs_reclaim(compact_result)) {
+                ret = compaction_zonelist_suitable(ac, order, alloc_flags);
+                goto out;
+        }
+
+        /*
          * make sure the compaction wasn't deferred or didn't bail out early
          * due to locks contention before we declare that we should give up.
-         * But do not retry if the given zonelist is not suitable for
-         * compaction.
+         * But the next retry should use a higher priority if allowed, so
+         * we don't just keep bailing out endlessly.
          */
         if (compaction_withdrawn(compact_result)) {
-                ret = compaction_zonelist_suitable(ac, order, alloc_flags);
-                goto out;
+                goto check_priority;
         }
 
         /*
@@ -6638,9 +6647,11 @@ static unsigned long __init calc_memmap_size(unsigned long spanned_pages,
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 static void pgdat_init_split_queue(struct pglist_data *pgdat)
 {
-        spin_lock_init(&pgdat->split_queue_lock);
-        INIT_LIST_HEAD(&pgdat->split_queue);
-        pgdat->split_queue_len = 0;
+        struct deferred_split *ds_queue = &pgdat->deferred_split_queue;
+
+        spin_lock_init(&ds_queue->split_queue_lock);
+        INIT_LIST_HEAD(&ds_queue->split_queue);
+        ds_queue->split_queue_len = 0;
 }
 #else
 static void pgdat_init_split_queue(struct pglist_data *pgdat) {}
@@ -8196,7 +8207,7 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count,
                         if (!hugepage_migration_supported(page_hstate(head)))
                                 goto unmovable;
 
-                        skip_pages = (1 << compound_order(head)) - (page - head);
+                        skip_pages = compound_nr(head) - (page - head);
                         iter += skip_pages - 1;
                         continue;
                 }