Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

1 files changed, 15 insertions, 21 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 6771ea70bfe7..060e4c191403 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -514,7 +514,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page)
 
                 freepage = mapping->a_ops->freepage;
 
-                __remove_from_page_cache(page);
+                __delete_from_page_cache(page);
                 spin_unlock_irq(&mapping->tree_lock);
                 mem_cgroup_uncharge_cache_page(page);
 
@@ -2397,9 +2397,9 @@ loop_again:
                  * cause too much scanning of the lower zones.
                  */
                 for (i = 0; i <= end_zone; i++) {
-                        int compaction;
                         struct zone *zone = pgdat->node_zones + i;
                         int nr_slab;
+                        unsigned long balance_gap;
 
                         if (!populated_zone(zone))
                                 continue;
@@ -2416,11 +2416,20 @@ loop_again:
                         mem_cgroup_soft_limit_reclaim(zone, order, sc.gfp_mask);
 
                         /*
-                         * We put equal pressure on every zone, unless one
-                         * zone has way too many pages free already.
+                         * We put equal pressure on every zone, unless
+                         * one zone has way too many pages free
+                         * already. The "too many pages" is defined
+                         * as the high wmark plus a "gap" where the
+                         * gap is either the low watermark or 1%
+                         * of the zone, whichever is smaller.
                          */
+                        balance_gap = min(low_wmark_pages(zone),
+                                (zone->present_pages +
+                                        KSWAPD_ZONE_BALANCE_GAP_RATIO-1) /
+                                KSWAPD_ZONE_BALANCE_GAP_RATIO);
                         if (!zone_watermark_ok_safe(zone, order,
-                                        8*high_wmark_pages(zone), end_zone, 0))
+                                        high_wmark_pages(zone) + balance_gap,
+                                        end_zone, 0))
                                 shrink_zone(priority, zone, &sc);
                         reclaim_state->reclaimed_slab = 0;
                         nr_slab = shrink_slab(sc.nr_scanned, GFP_KERNEL,
@@ -2428,24 +2437,9 @@ loop_again:
                         sc.nr_reclaimed += reclaim_state->reclaimed_slab;
                         total_scanned += sc.nr_scanned;
 
-                        compaction = 0;
-                        if (order &&
-                            zone_watermark_ok(zone, 0,
-                                               high_wmark_pages(zone),
-                                              end_zone, 0) &&
-                            !zone_watermark_ok(zone, order,
-                                               high_wmark_pages(zone),
-                                               end_zone, 0)) {
-                                compact_zone_order(zone,
-                                                   order,
-                                                   sc.gfp_mask, false,
-                                                   COMPACT_MODE_KSWAPD);
-                                compaction = 1;
-                        }
-
                         if (zone->all_unreclaimable)
                                 continue;
-                        if (!compaction && nr_slab == 0 &&
+                        if (nr_slab == 0 &&
                             !zone_reclaimable(zone))
                                 zone->all_unreclaimable = 1;
                         /*