On Mon, Nov 20, 2023 at 07:34:16PM +0100, Vlastimil Babka wrote: > With SLAB removed, these are never true anymore so we can clean up. > > Reviewed-by: Kees Cook <[email protected]> > Acked-by: Michal Hocko <[email protected]> > Signed-off-by: Vlastimil Babka <[email protected]> > --- > mm/memcontrol.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 774bd6e21e27..947fb50eba31 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5149,7 +5149,7 @@ static ssize_t memcg_write_event_control(struct > kernfs_open_file *of, > return ret; > } > > -#if defined(CONFIG_MEMCG_KMEM) && (defined(CONFIG_SLAB) || > defined(CONFIG_SLUB_DEBUG)) > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) > static int mem_cgroup_slab_show(struct seq_file *m, void *p) > { > /* > @@ -5258,8 +5258,7 @@ static struct cftype mem_cgroup_legacy_files[] = { > .write = mem_cgroup_reset, > .read_u64 = mem_cgroup_read_u64, > }, > -#if defined(CONFIG_MEMCG_KMEM) && \ > - (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG)) > +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG) > { > .name = "kmem.slabinfo", > .seq_show = mem_cgroup_slab_show,
Looks good to me, Reviewed-by: Hyeonggon Yoo <[email protected]> > > -- > 2.42.1 > >
