mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account-fix

fix it for
mm-slub-call-account_slab_page-after-slab-page-initialization-fix.patch

Cc: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/slub.c b/mm/slub.c
index f695b07fee48e91f1c80903fde21ca3b70466137..d4a33ec0ce5b8c266bf24b7d43c835b5e82fbb3c 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1771,7 +1771,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
 
        page->objects = oo_objects(oo);
 
-       account_slab_page(page, oo_order(oo), s);
+       account_slab_page(page, oo_order(oo), s, flags);
 
        page->slab_cache = s;
        __SetPageSlab(page);