diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-18 11:28:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-18 11:28:03 +0300 |
| commit | 3a2f2ac9b96f9a9f5538396a212d3b9fb543bfc5 (patch) | |
| tree | 294c2f340b11584e58cea90adfc4182ac8742348 /mm/vmpressure.c | |
| parent | 4e79e182b419172e35936a47f098509092d69817 (diff) | |
| parent | f4eafd8bcd5229e998aa252627703b8462c3b90f (diff) | |
| download | linux-3a2f2ac9b96f9a9f5538396a212d3b9fb543bfc5.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/vmpressure.c')
| -rw-r--r-- | mm/vmpressure.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/vmpressure.c b/mm/vmpressure.c index 9a6c0704211c..149fdf6c5c56 100644 --- 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) |