diff options
author | 2016-01-20 15:02:32 -0800 | |
---|---|---|
committer | 2016-01-20 17:09:18 -0800 | |
commit | 127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec (patch) | |
tree | 7748cabc717161032e479be17e20f5046c9a8335 /include/linux/slab.h | |
parent | mm: memcontrol: separate kmem code from legacy tcp accounting code (diff) | |
download | linux-127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec.tar.gz linux-127424c86bb6cb87f0b563d9fdcfbbaf3c86ecec.tar.bz2 linux-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.h')
-rw-r--r-- | include/linux/slab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 3ffee7422012..3627d5c1bc47 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -86,7 +86,7 @@ #else # define SLAB_FAILSLAB 0x00000000UL #endif -#ifdef CONFIG_MEMCG_KMEM +#if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB) # define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */ #else # define SLAB_ACCOUNT 0x00000000UL |