summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2015-10-15 15:28:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-16 11:42:28 -0700
commit424cdc14138088ada1b0e407a2195b2783c6e5ef (patch)
tree346cb6c621d85e998868d6f1d50be2b2bcd0982a
parent8d740a37b92f3d4a0435fe263b32efc7f61c5efb (diff)
downloadop-kernel-dev-424cdc14138088ada1b0e407a2195b2783c6e5ef.zip
op-kernel-dev-424cdc14138088ada1b0e407a2195b2783c6e5ef.tar.gz
memcg: convert threshold to bytes
page_counter_memparse() returns pages for the threshold, while mem_cgroup_usage() returns bytes for memory usage. Convert the threshold to bytes. Fixes: 3e32cb2e0a12b6915 ("memcg: rename cgroup_event to mem_cgroup_event"). Signed-off-by: Shaohua Li <shli@fb.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1fedbde..d9b5c81 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3387,6 +3387,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
ret = page_counter_memparse(args, "-1", &threshold);
if (ret)
return ret;
+ threshold <<= PAGE_SHIFT;
mutex_lock(&memcg->thresholds_lock);
OpenPOWER on IntegriCloud