Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / mm / slab.h

diff --git a/mm/slab.h b/mm/slab.h
index b2b0169..7e94700 100644 (file)
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -139,7 +139,7 @@ extern struct kmem_cache *kmem_cache;
 
 /* A table of kmalloc cache names and sizes */
 extern const struct kmalloc_info_struct {
-       const char *name;
+       const char *name[NR_KMALLOC_TYPES];
        unsigned int size;
 } kmalloc_info[];
 
@@ -369,7 +369,7 @@ static __always_inline int memcg_charge_slab(struct page *page,
        if (ret)
                goto out;
 
-       lruvec = mem_cgroup_lruvec(page_pgdat(page), memcg);
+       lruvec = mem_cgroup_lruvec(memcg, page_pgdat(page));
        mod_lruvec_state(lruvec, cache_vmstat_idx(s), 1 << order);
 
        /* transer try_charge() page references to kmem_cache */
@@ -393,7 +393,7 @@ static __always_inline void memcg_uncharge_slab(struct page *page, int order,
        rcu_read_lock();
        memcg = READ_ONCE(s->memcg_params.memcg);
        if (likely(!mem_cgroup_is_root(memcg))) {
-               lruvec = mem_cgroup_lruvec(page_pgdat(page), memcg);
+               lruvec = mem_cgroup_lruvec(memcg, page_pgdat(page));
                mod_lruvec_state(lruvec, cache_vmstat_idx(s), -(1 << order));
                memcg_kmem_uncharge_memcg(page, order, memcg);
        } else {