mm/rmap: always do TTU_IGNORE_ACCESS

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

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 9fe201a..f76353f 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1084,7 +1084,6 @@ static void page_check_dirty_writeback(struct page *page,
 static unsigned long shrink_page_list(struct list_head *page_list,
                                      struct pglist_data *pgdat,
                                      struct scan_control *sc,
-                                     enum ttu_flags ttu_flags,
                                      struct reclaim_stat *stat,
                                      bool ignore_references)
 {
@@ -1310,7 +1309,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                 * processes. Try to unmap it here.
                 */
                if (page_mapped(page)) {
-                       enum ttu_flags flags = ttu_flags | TTU_BATCH_FLUSH;
+                       enum ttu_flags flags = TTU_BATCH_FLUSH;
 
                        if (unlikely(PageTransHuge(page)))
                                flags |= TTU_SPLIT_HUGE_PMD;
@@ -1521,7 +1520,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone,
        }
 
        ret = shrink_page_list(&clean_pages, zone->zone_pgdat, &sc,
-                       TTU_IGNORE_ACCESS, &dummy_stat, true);
+                               &dummy_stat, true);
        list_splice(&clean_pages, page_list);
        mod_node_page_state(zone->zone_pgdat, NR_ISOLATED_FILE, -ret);
        return ret;
@@ -1952,8 +1951,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
        if (nr_taken == 0)
                return 0;
 
-       nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, 0,
-                               &stat, false);
+       nr_reclaimed = shrink_page_list(&page_list, pgdat, sc, &stat, false);
 
        spin_lock_irq(&pgdat->lru_lock);
 
@@ -2134,8 +2132,7 @@ unsigned long reclaim_pages(struct list_head *page_list)
 
                nr_reclaimed += shrink_page_list(&node_page_list,
                                                NODE_DATA(nid),
-                                               &sc, 0,
-                                               &dummy_stat, false);
+                                               &sc, &dummy_stat, false);
                while (!list_empty(&node_page_list)) {
                        page = lru_to_page(&node_page_list);
                        list_del(&page->lru);
@@ -2148,8 +2145,7 @@ unsigned long reclaim_pages(struct list_head *page_list)
        if (!list_empty(&node_page_list)) {
                nr_reclaimed += shrink_page_list(&node_page_list,
                                                NODE_DATA(nid),
-                                               &sc, 0,
-                                               &dummy_stat, false);
+                                               &sc, &dummy_stat, false);
                while (!list_empty(&node_page_list)) {
                        page = lru_to_page(&node_page_list);
                        list_del(&page->lru);