Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm...

[~andy/linux] / mm / page-writeback.c

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 61119b8a11e6d37bb90a6446dd4b44c7c408c161..2d30e2cfe8047606064f117fbaca4675540e00dd 100644 (file)
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -205,7 +205,8 @@ static unsigned long zone_dirtyable_memory(struct zone *zone)
        nr_pages = zone_page_state(zone, NR_FREE_PAGES);
        nr_pages -= min(nr_pages, zone->dirty_balance_reserve);
 
-       nr_pages += zone_reclaimable_pages(zone);
+       nr_pages += zone_page_state(zone, NR_INACTIVE_FILE);
+       nr_pages += zone_page_state(zone, NR_ACTIVE_FILE);
 
        return nr_pages;
 }
@@ -258,7 +259,8 @@ static unsigned long global_dirtyable_memory(void)
        x = global_page_state(NR_FREE_PAGES);
        x -= min(x, dirty_balance_reserve);
 
-       x += global_reclaimable_pages();
+       x += global_page_state(NR_INACTIVE_FILE);
+       x += global_page_state(NR_ACTIVE_FILE);
 
        if (!vm_highmem_is_dirtyable)
                x -= highmem_dirtyable_memory(x);