projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: memcontrol: group kmem init and exit functions together
[cascardo/linux.git]
/
mm
/
slab_common.c
diff --git
a/mm/slab_common.c
b/mm/slab_common.c
index
3c6a86b
..
8c262e6
100644
(file)
--- a/
mm/slab_common.c
+++ b/
mm/slab_common.c
@@
-37,7
+37,8
@@
struct kmem_cache *kmem_cache;
SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \
SLAB_FAILSLAB)
SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \
SLAB_FAILSLAB)
-#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | SLAB_NOTRACK)
+#define SLAB_MERGE_SAME (SLAB_RECLAIM_ACCOUNT | SLAB_CACHE_DMA | \
+ SLAB_NOTRACK | SLAB_ACCOUNT)
/*
* Merge control. If this is set then no merging of slab caches will occur.
/*
* Merge control. If this is set then no merging of slab caches will occur.
@@
-502,10
+503,10
@@
void memcg_create_kmem_cache(struct mem_cgroup *memcg,
mutex_lock(&slab_mutex);
/*
mutex_lock(&slab_mutex);
/*
- * The memory cgroup could have been
deactivat
ed while the cache
+ * The memory cgroup could have been
offlin
ed while the cache
* creation work was pending.
*/
* creation work was pending.
*/
- if (!memcg_kmem_
is_activ
e(memcg))
+ if (!memcg_kmem_
onlin
e(memcg))
goto out_unlock;
idx = memcg_cache_id(memcg);
goto out_unlock;
idx = memcg_cache_id(memcg);