Commit bc3dcb85 authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

mm/memcontrol: remove CONFIG_SLAB #ifdef guards 



With SLAB removed, these are never true anymore so we can clean up.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Tested-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Tested-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent a745b067

mm/memcontrol.c

+2 −3
Original line number Diff line number Diff line
@@ -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,