Merge tag 'mvebu-dt64-4.6-2' of git://git.infradead.org/linux-mvebu into next/dt64

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

diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 89b1d44..149fdf6 100644 (file)
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -248,9 +248,8 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
 
        if (tree) {
                spin_lock(&vmpr->sr_lock);
-               vmpr->tree_scanned += scanned;
+               scanned = vmpr->tree_scanned += scanned;
                vmpr->tree_reclaimed += reclaimed;
-               scanned = vmpr->scanned;
                spin_unlock(&vmpr->sr_lock);
 
                if (scanned < vmpressure_win)
@@ -275,7 +274,6 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
 
                level = vmpressure_calc_level(scanned, reclaimed);
 
-#ifdef CONFIG_INET
                if (level > VMPRESSURE_LOW) {
                        /*
                         * Let the socket buffer allocator know that
@@ -287,7 +285,6 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
                         */
                        memcg->socket_pressure = jiffies + HZ;
                }
-#endif
        }
 }