Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax

[sfrench/cifs-2.6.git] / mm / workingset.c

diff --git a/mm/workingset.c b/mm/workingset.c
index 80c913c89f116af469fbd46bc46ad7149ed870ab..ac839fca0e76ae3cc5a025684cb1516301922d92 100644 (file)
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -6,6 +6,7 @@
 
 #include <linux/memcontrol.h>
 #include <linux/writeback.h>
 
 #include <linux/memcontrol.h>
 #include <linux/writeback.h>

+#include <linux/shmem_fs.h>

 #include <linux/pagemap.h>
 #include <linux/atomic.h>
 #include <linux/module.h>
 #include <linux/pagemap.h>
 #include <linux/atomic.h>
 #include <linux/module.h>


@@ -267,7 +268,7 @@ bool workingset_refault(void *shadow)
        }
        lruvec = mem_cgroup_lruvec(pgdat, memcg);
        refault = atomic_long_read(&lruvec->inactive_age);
        }
        lruvec = mem_cgroup_lruvec(pgdat, memcg);
        refault = atomic_long_read(&lruvec->inactive_age);

-       active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE);
+       active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE, MAX_NR_ZONES);

        rcu_read_unlock();
 
        /*
        rcu_read_unlock();
 
        /*