diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 18:42:37 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 18:42:37 (GMT) |
commit | 3d875182d7f4b27b7778c3ab6a39800d383968cb (patch) | |
tree | 588a0f89219f4252d93a102b49f661b1bf435a84 /mm/memcontrol.c | |
parent | 69984b64440729bf6b08d1ddc1b3ee8282a2c846 (diff) | |
parent | 934ed25ea505859cec5236dcb1769be5f998dd25 (diff) | |
download | linux-3d875182d7f4b27b7778c3ab6a39800d383968cb.tar.xz |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"6 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
sh: add copy_user_page() alias for __copy_user()
lib/Kconfig: ZLIB_DEFLATE must select BITREVERSE
mm, dax: fix DAX deadlocks
memcg: convert threshold to bytes
builddeb: remove debian/files before build
mm, fs: obey gfp_mapping for add_to_page_cache()
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 1 |
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); |