]> www.infradead.org Git - users/jedix/linux-maple.git/commit
memcg: convert threshold to bytes
authorShaohua Li <shli@fb.com>
Thu, 15 Oct 2015 22:28:29 +0000 (15:28 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Oct 2015 00:51:53 +0000 (09:51 +0900)
commit2105f9aec785cbc4679132abb44645bb3c59a93e
tree4d805390f031f2758cdf1a9bcb625fa34ca7ca65
parent3ae2c7951214fd5926101e817432feabb7f72feb
memcg: convert threshold to bytes

commit 424cdc14138088ada1b0e407a2195b2783c6e5ef upstream.

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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mm/memcontrol.c