Bluetooth: ath3k: Add support for a new AR3012 device

[pandora-kernel.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5a98836..580a5f0 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1027,6 +1027,10 @@ static int try_to_steal_freepages(struct zone *zone, struct page *page,
 {
        int current_order = page_order(page);
 
+       /*
+        * When borrowing from MIGRATE_CMA, we need to release the excess
+        * buddy pages to CMA itself.
+        */
        if (is_migrate_cma(fallback_type))
                return fallback_type;
 
@@ -1091,21 +1095,11 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype)
                        list_del(&page->lru);
                        rmv_page_order(page);
 
-                       /*
-                        * Borrow the excess buddy pages as well, irrespective
-                        * of whether we stole freepages, or took ownership of
-                        * the pageblock or not.
-                        *
-                        * Exception: When borrowing from MIGRATE_CMA, release
-                        * the excess buddy pages to CMA itself.
-                        */
                        expand(zone, page, order, current_order, area,
-                              is_migrate_cma(migratetype)
-                            ? migratetype : start_migratetype);
+                              new_type);
 
-                       trace_mm_page_alloc_extfrag(page, order,
-                               current_order, start_migratetype, migratetype,
-                               new_type == start_migratetype);
+                       trace_mm_page_alloc_extfrag(page, order, current_order,
+                               start_migratetype, migratetype, new_type);
 
                        return page;
                }
@@ -1711,7 +1705,7 @@ bool zone_watermark_ok_safe(struct zone *z, int order, unsigned long mark,
  * comments in mmzone.h.  Reduces cache footprint of zonelist scans
  * that have to skip over a lot of full or unallowed zones.
  *
- * If the zonelist cache is present in the passed in zonelist, then
+ * If the zonelist cache is present in the passed zonelist, then
  * returns a pointer to the allowed node mask (either the current
  * tasks mems_allowed, or node_states[N_MEMORY].)
  *