Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-drm-fsl-dcu.git] / mm / memcontrol.c

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1fedbde68f595c2b83d5aa84962a667c1ada120a..d9b5c817dce8e0a99aab1853eafc572e5b70015f 100644 (file)
--- 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);