Commit 1c3a0b3d authored by Roman Gushchin's avatar Roman Gushchin Committed by Andrew Morton
Browse files

mm: memcg: put struct task_struct::memcg_in_oom under CONFIG_MEMCG_V1 

The memcg_in_oom field of the struct task_struct is not used by the cgroup
v2's memory controller, so it can be happily compiled out if
CONFIG_MEMCG_V1 is not set.

Link: https://lkml.kernel.org/r/20240628210317.272856-9-roman.gushchin@linux.dev


Signed-off-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Acked-by: default avatarShakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 98c9daf5

include/linux/sched.h

+3 −1
Original line number Diff line number Diff line
@@ -1447,9 +1447,11 @@ struct task_struct { 
	unsigned int			kcov_softirq;

#endif



#ifdef CONFIG_MEMCG

#ifdef CONFIG_MEMCG_V1

	struct mem_cgroup		*memcg_in_oom;

#endif



#ifdef CONFIG_MEMCG

	/* Number of pages to reclaim on returning to userland: */

	unsigned int			memcg_nr_pages_over_high;