aboutsummaryrefslogtreecommitdiff
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 14:27:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-30 14:27:10 -0700
commit12aee278b50c4a94a93fa0b4d201ae35d792c696 (patch)
tree98c0c42c9095aae34d12a4b8c555176698b7202a /mm/memcontrol.c
parentc56b097af26cb11c1f49a4311ba538c825666fed (diff)
parent5e8cfc3c75b3e43497389896c0ecda62fc311ce9 (diff)
downloadlinux-12aee278b50c4a94a93fa0b4d201ae35d792c696.tar.gz
Merge branch 'akpm' (fixes from Andrew Morton)
Merge three fixes from Andrew Morton. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: memcg: use __this_cpu_sub() to dec stats to avoid incorrect subtrahend casting percpu: fix this_cpu_sub() subtrahend casting for unsigneds mm/pagewalk.c: fix walk_page_range() access of wrong PTEs
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 34d3ca9572d..497ec33ff22 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3774,7 +3774,7 @@ void mem_cgroup_move_account_page_stat(struct mem_cgroup *from,
/* Update stat data for mem_cgroup */
preempt_disable();
WARN_ON_ONCE(from->stat->count[idx] < nr_pages);
- __this_cpu_add(from->stat->count[idx], -nr_pages);
+ __this_cpu_sub(from->stat->count[idx], nr_pages);
__this_cpu_add(to->stat->count[idx], nr_pages);
preempt_enable();
}