nl80211: define multicast group names in header

[android-x86/kernel.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 06aeaf0..e03dd6f 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -240,7 +240,7 @@ struct kmem_cache *find_mergeable(size_t size, size_t align,
        size = ALIGN(size, align);
        flags = kmem_cache_flags(size, flags, name, NULL);
 
-       list_for_each_entry(s, &slab_caches, list) {
+       list_for_each_entry_reverse(s, &slab_caches, list) {
                if (slab_unmergeable(s))
                        continue;
 
@@ -811,7 +811,7 @@ EXPORT_SYMBOL(kmalloc_order_trace);
 #define SLABINFO_RIGHTS S_IRUSR
 #endif
 
-void print_slabinfo_header(struct seq_file *m)
+static void print_slabinfo_header(struct seq_file *m)
 {
        /*
         * Output format version, so at least we can change it
@@ -876,7 +876,7 @@ memcg_accumulate_slabinfo(struct kmem_cache *s, struct slabinfo *info)
        }
 }
 
-int cache_show(struct kmem_cache *s, struct seq_file *m)
+static void cache_show(struct kmem_cache *s, struct seq_file *m)
 {
        struct slabinfo sinfo;
 
@@ -895,7 +895,6 @@ int cache_show(struct kmem_cache *s, struct seq_file *m)
                   sinfo.active_slabs, sinfo.num_slabs, sinfo.shared_avail);
        slabinfo_show_stats(m, s);
        seq_putc(m, '\n');
-       return 0;
 }
 
 static int slab_show(struct seq_file *m, void *p)
@@ -904,11 +903,25 @@ static int slab_show(struct seq_file *m, void *p)
 
        if (p == slab_caches.next)
                print_slabinfo_header(m);
-       if (!is_root_cache(s))
-               return 0;
-       return cache_show(s, m);
+       if (is_root_cache(s))
+               cache_show(s, m);
+       return 0;
 }
 
+#ifdef CONFIG_MEMCG_KMEM
+int memcg_slab_show(struct seq_file *m, void *p)
+{
+       struct kmem_cache *s = list_entry(p, struct kmem_cache, list);
+       struct mem_cgroup *memcg = mem_cgroup_from_css(seq_css(m));
+
+       if (p == slab_caches.next)
+               print_slabinfo_header(m);
+       if (!is_root_cache(s) && s->memcg_params->memcg == memcg)
+               cache_show(s, m);
+       return 0;
+}
+#endif
+
 /*
  * slabinfo_op - iterator that generates /proc/slabinfo
  *