This patchset puts all cgroup v1's members of struct mem_cgroup, struct mem_cgroup_per_node and struct task_struct under the CONFIG_MEMCG_V1 config option. If cgroup v1 support is not required (and it's true for many cgroup users these days), it allows to save a bit of memory and compile out some code, some of which is on relatively hot paths. It also structures the code a bit better by grouping cgroup v1-specific stuff in one place. Roman Gushchin (9): mm: memcg: move memcg_account_kmem() to memcontrol-v1.c mm: memcg: factor out legacy socket memory accounting code mm: memcg: guard cgroup v1-specific code in mem_cgroup_print_oom_meminfo() mm: memcg: gather memcg1-specific fields initialization in memcg1_memcg_init() mm: memcg: guard memcg1-specific fields accesses in mm/memcontrol.c mm: memcg: put memcg1-specific struct mem_cgroup's members under CONFIG_MEMCG_V1 mm: memcg: guard memcg1-specific members of struct mem_cgroup_per_node mm: memcg: put struct task_struct::memcg_in_oom under CONFIG_MEMCG_V1 mm: memcg: put struct task_struct::in_user_fault under CONFIG_MEMCG_V1 include/linux/memcontrol.h | 147 +++++++++++++++++++------------------ include/linux/sched.h | 6 +- mm/memcontrol-v1.c | 38 ++++++++++ mm/memcontrol-v1.h | 20 +++++ mm/memcontrol.c | 70 +++++++----------- 5 files changed, 164 insertions(+), 117 deletions(-) -- 2.45.2.803.g4e1b14247a-goog