The patch titled
Subject: memcg: convert threshold to bytes
has been added to the -mm tree. Its filename is
memcg-convert-threshold-to-bytes.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memcg-convert-threshold-to-bytes.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memcg-convert-threshold-to-bytes.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Shaohua Li <shli@xxxxxx>
Subject: 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.
Looks a regression introduced by 3e32cb2e0a12b6915 ("memcg: rename
cgroup_event to mem_cgroup_event").
Signed-off-by: Shaohua Li <shli@xxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 1 +
1 file changed, 1 insertion(+)
diff -puN mm/memcontrol.c~memcg-convert-threshold-to-bytes mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-convert-threshold-to-bytes
+++ a/mm/memcontrol.c
@@ -3407,6 +3407,7 @@ static int __mem_cgroup_usage_register_e
ret = page_counter_memparse(args, "-1", &threshold);
if (ret)
return ret;
+ threshold <<= PAGE_SHIFT;
mutex_lock(&memcg->thresholds_lock);
_
Patches currently in -mm which might be from shli@xxxxxx are
memcg-convert-threshold-to-bytes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
