aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2015-02-11 18:26:03 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-11 20:06:02 -0500
commit650c5e565492f9092552bfe4d65935196c7d9567 (patch)
tree5fce0f701502f4b75339d4c53b37301d3db65fdb /mm/memcontrol.c
parent8d29e18a459dfc2adeafc1acb9c4185ee6713116 (diff)
mm: page_counter: pull "-1" handling out of page_counter_memparse()
The unified hierarchy interface for memory cgroups will no longer use "-1" to mean maximum possible resource value. In preparation for this, make the string an argument and let the caller supply it. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: Vladimir Davydov <vdavydov@parallels.com> Cc: Greg Thelen <gthelen@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index dc5c4cd0afdf..6453ea5a27aa 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3414,7 +3414,7 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of,
3414 int ret; 3414 int ret;
3415 3415
3416 buf = strstrip(buf); 3416 buf = strstrip(buf);
3417 ret = page_counter_memparse(buf, &nr_pages); 3417 ret = page_counter_memparse(buf, "-1", &nr_pages);
3418 if (ret) 3418 if (ret)
3419 return ret; 3419 return ret;
3420 3420
@@ -3786,7 +3786,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
3786 unsigned long usage; 3786 unsigned long usage;
3787 int i, size, ret; 3787 int i, size, ret;
3788 3788
3789 ret = page_counter_memparse(args, &threshold); 3789 ret = page_counter_memparse(args, "-1", &threshold);
3790 if (ret) 3790 if (ret)
3791 return ret; 3791 return ret;
3792 3792