On Sat, Jun 25, 2022 at 11:51 AM Xiang Yang <xiangyang3@xxxxxxxxxx> wrote: > > mem_cgroup_kmem_disabled() checks whether the kmem accounting is off. > Therefore, replace cgroup_memory_nokmem with mem_cgroup_kmem_disabled(), > which is the same work in percpu.c and slab_common.c. > > Signed-off-by: Xiang Yang <xiangyang3@xxxxxxxxxx> Acked-by: Souptick Joarder (HPE) <jrdr.linux@xxxxxxxxx> > --- > mm/memcontrol.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 85adc43c5a25..4672c9ddd188 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -3815,7 +3815,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, > #ifdef CONFIG_MEMCG_KMEM > static int memcg_online_kmem(struct mem_cgroup *memcg) > { > - if (cgroup_memory_nokmem) > + if (mem_cgroup_kmem_disabled()) > return 0; > > if (unlikely(mem_cgroup_is_root(memcg))) > @@ -3830,7 +3830,7 @@ static int memcg_online_kmem(struct mem_cgroup *memcg) > > static void memcg_offline_kmem(struct mem_cgroup *memcg) > { > - if (cgroup_memory_nokmem) > + if (mem_cgroup_kmem_disabled()) > return; > > if (unlikely(mem_cgroup_is_root(memcg))) > -- > 2.22.0 > >