lkml.org 
[lkml]   [2023]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 04/20] mm/memcontrol: remove CONFIG_SLAB #ifdef guards
    On Mon 13-11-23 20:13:45, Vlastimil Babka wrote:
    > With SLAB removed, these are never true anymore so we can clean up.
    >
    > Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

    Acked-by: Michal Hocko <mhocko@suse.com>

    > ---
    > 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,
    > --
    > 2.42.1

    --
    Michal Hocko
    SUSE Labs

    \
     
     \ /
      Last update: 2023-11-20 13:58    [W:8.594 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site