git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
mm: correctly charge compressed memory to its memcg
[sfrench/cifs-2.6.git]
/
mm
/
memcontrol.c
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index 2d8549ae1b3004f78c244e578d3bf0ce36b0b844..a1a35c12635ef7ea49528c8857fae9016644cfc9 100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-3026,7
+3026,7
@@
struct obj_cgroup *get_obj_cgroup_from_page(struct page *page)
{
struct obj_cgroup *objcg;
- if (!memcg_kmem_enabled()
|| memcg_kmem_bypass()
)
+ if (!memcg_kmem_enabled())
return NULL;
if (PageMemcgKmem(page)) {