arm: exynos5: fix the number of GPIO groups on bank A

[cascardo/linux.git] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1a51868..b4664de 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -156,6 +156,11 @@ struct mem_cgroup_zone {
 int vm_swappiness = 60;
 long vm_total_pages;   /* The total number of pages which the VM controls */
 
+/*
+ * Low watermark used to prevent fscache thrashing during low memory.
+ */
+int min_filelist_kbytes;
+
 static LIST_HEAD(shrinker_list);
 static DECLARE_RWSEM(shrinker_rwsem);
 
@@ -1568,9 +1573,14 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz,
        reclaim_stat->recent_scanned[0] += nr_anon;
        reclaim_stat->recent_scanned[1] += nr_file;
 
-       if (current_is_kswapd())
-               __count_vm_events(KSWAPD_STEAL, nr_reclaimed);
-       __count_zone_vm_events(PGSTEAL, zone, nr_reclaimed);
+       if (global_reclaim(sc)) {
+               if (current_is_kswapd())
+                       __count_zone_vm_events(PGSTEAL_KSWAPD, zone,
+                                              nr_reclaimed);
+               else
+                       __count_zone_vm_events(PGSTEAL_DIRECT, zone,
+                                              nr_reclaimed);
+       }
 
        putback_inactive_pages(mz, &page_list);
 
@@ -1860,12 +1870,32 @@ static int inactive_list_is_low(struct mem_cgroup_zone *mz, int file)
                return inactive_anon_is_low(mz);
 }
 
+/*
+ * Check low watermark used to prevent fscache thrashing during low memory.
+ */
+static int file_is_low(struct mem_cgroup_zone *mz)
+{
+       unsigned long pages_min, active, inactive;
+
+       if (!scanning_global_lru(mz))
+               return false;
+
+       pages_min = min_filelist_kbytes >> (PAGE_SHIFT - 10);
+       active = zone_page_state(mz->zone, NR_ACTIVE_FILE);
+       inactive = zone_page_state(mz->zone, NR_INACTIVE_FILE);
+
+       return ((active + inactive) < pages_min);
+}
+
 static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
                                 struct mem_cgroup_zone *mz,
                                 struct scan_control *sc, int priority)
 {
        int file = is_file_lru(lru);
 
+       if (file && file_is_low(mz))
+               return 0;
+
        if (is_active_lru(lru)) {
                if (inactive_list_is_low(mz, file))
                        shrink_active_list(nr_to_scan, mz, sc, priority, file);
@@ -3172,11 +3202,16 @@ unsigned long global_reclaimable_pages(void)
 
 unsigned long zone_reclaimable_pages(struct zone *zone)
 {
+       unsigned long pages_min;
        int nr;
 
        nr = zone_page_state(zone, NR_ACTIVE_FILE) +
             zone_page_state(zone, NR_INACTIVE_FILE);
 
+       pages_min = min_filelist_kbytes >> (PAGE_SHIFT - 10);
+       if (nr < pages_min)
+               nr = 0;
+
        if (nr_swap_pages > 0)
                nr += zone_page_state(zone, NR_ACTIVE_ANON) +
                      zone_page_state(zone, NR_INACTIVE_ANON);