diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2016-01-20 15:02:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 17:09:18 -0800 |
| commit | 127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec (patch) | |
| tree | 7748cabc717161032e479be17e20f5046c9a8335 /include/linux/slab_def.h | |
| parent | 3893e302f6a377c4ef0f077f190bf760bf84e0be (diff) | |
| download | linux-stable-127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec.tar.gz linux-stable-127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec.tar.bz2 linux-stable-127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec.zip | |
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
The cgroup2 memory controller will account important in-kernel memory
consumers per default. Move all necessary components to CONFIG_MEMCG.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/slab_def.h')
| -rw-r--r-- | include/linux/slab_def.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index 33d049066c3d..cf139d3fa513 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -69,7 +69,8 @@ struct kmem_cache { */ int obj_offset; #endif /* CONFIG_DEBUG_SLAB */ -#ifdef CONFIG_MEMCG_KMEM + +#ifdef CONFIG_MEMCG struct memcg_cache_params memcg_params; #endif |