1 files changed, 3 insertions, 2 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 8b8508adf9c2..75d55fdfe3a1 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3577,6 +3577,7 @@ static struct kmem_cache * __init bootstrap(struct kmem_cache *static_cache)
                         p->slab_cache = s;
 #endif
         }
+        slab_init_memcg_params(s);
         list_add(&s->list, &slab_caches);
         return s;
 }
@@ -4964,7 +4965,7 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s)
         if (is_root_cache(s))
                 return;
 
-        root_cache = s->memcg_params->root_cache;
+        root_cache = s->memcg_params.root_cache;
 
         /*
          * This mean this cache had no attribute written. Therefore, no point
@@ -5044,7 +5045,7 @@ static inline struct kset *cache_kset(struct kmem_cache *s)
 {
 #ifdef CONFIG_MEMCG_KMEM
         if (!is_root_cache(s))
-                return s->memcg_params->root_cache->memcg_kset;
+                return s->memcg_params.root_cache->memcg_kset;
 #endif
         return slab_kset;
 }