USB: serial: qcserial: add new usb-id for Dell Wireless DW5826e

[platform/kernel/linux-rpi.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0c5be12..afed33f 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2400,7 +2400,7 @@ void free_unref_page(struct page *page, unsigned int order)
        struct per_cpu_pages *pcp;
        struct zone *zone;
        unsigned long pfn = page_to_pfn(page);
-       int migratetype;
+       int migratetype, pcpmigratetype;
 
        if (!free_unref_page_prepare(page, pfn, order))
                return;
@@ -2408,24 +2408,24 @@ void free_unref_page(struct page *page, unsigned int order)
        /*
         * We only track unmovable, reclaimable and movable on pcp lists.
         * Place ISOLATE pages on the isolated list because they are being
-        * offlined but treat HIGHATOMIC as movable pages so we can get those
-        * areas back if necessary. Otherwise, we may have to free
+        * offlined but treat HIGHATOMIC and CMA as movable pages so we can
+        * get those areas back if necessary. Otherwise, we may have to free
         * excessively into the page allocator
         */
-       migratetype = get_pcppage_migratetype(page);
+       migratetype = pcpmigratetype = get_pcppage_migratetype(page);
        if (unlikely(migratetype >= MIGRATE_PCPTYPES)) {
                if (unlikely(is_migrate_isolate(migratetype))) {
                        free_one_page(page_zone(page), page, pfn, order, migratetype, FPI_NONE);
                        return;
                }
-               migratetype = MIGRATE_MOVABLE;
+               pcpmigratetype = MIGRATE_MOVABLE;
        }
 
        zone = page_zone(page);
        pcp_trylock_prepare(UP_flags);
        pcp = pcp_spin_trylock(zone->per_cpu_pageset);
        if (pcp) {
-               free_unref_page_commit(zone, pcp, page, migratetype, order);
+               free_unref_page_commit(zone, pcp, page, pcpmigratetype, order);
                pcp_spin_unlock(pcp);
        } else {
                free_one_page(zone, page, pfn, order, migratetype, FPI_NONE);
@@ -3809,14 +3809,9 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order,
        else
                (*no_progress_loops)++;
 
-       /*
-        * Make sure we converge to OOM if we cannot make any progress
-        * several times in the row.
-        */
-       if (*no_progress_loops > MAX_RECLAIM_RETRIES) {
-               /* Before OOM, exhaust highatomic_reserve */
-               return unreserve_highatomic_pageblock(ac, true);
-       }
+       if (*no_progress_loops > MAX_RECLAIM_RETRIES)
+               goto out;
+
 
        /*
         * Keep reclaiming pages while there is a chance this will lead
@@ -3859,6 +3854,11 @@ should_reclaim_retry(gfp_t gfp_mask, unsigned order,
                schedule_timeout_uninterruptible(1);
        else
                cond_resched();
+out:
+       /* Before OOM, exhaust highatomic_reserve */
+       if (!ret)
+               return unreserve_highatomic_pageblock(ac, true);
+
        return ret;
 }
 
@@ -6475,6 +6475,7 @@ static void break_down_buddy_pages(struct zone *zone, struct page *page,
                        next_page = page;
                        current_buddy = page + size;
                }
+               page = next_page;
 
                if (set_page_guard(zone, current_buddy, high, migratetype))
                        continue;
@@ -6482,7 +6483,6 @@ static void break_down_buddy_pages(struct zone *zone, struct page *page,
                if (current_buddy != target) {
                        add_to_free_list(current_buddy, zone, high, migratetype);
                        set_buddy_order(current_buddy, high);
-                       page = next_page;
                }
        }
 }