net: Fix skb->csum update in inet_proto_csum_replace16().

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3c6a86b..01e7246 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -250,7 +250,7 @@ struct kmem_cache *find_mergeable(size_t size, size_t align,
 {
        struct kmem_cache *s;
 
-       if (slab_nomerge || (flags & SLAB_NEVER_MERGE))
+       if (slab_nomerge)
                return NULL;
 
        if (ctor)
@@ -261,6 +261,9 @@ struct kmem_cache *find_mergeable(size_t size, size_t align,
        size = ALIGN(size, align);
        flags = kmem_cache_flags(size, flags, name, NULL);
 
+       if (flags & SLAB_NEVER_MERGE)
+               return NULL;
+
        list_for_each_entry_reverse(s, &slab_caches, list) {
                if (slab_unmergeable(s))
                        continue;
@@ -521,8 +524,8 @@ void memcg_create_kmem_cache(struct mem_cgroup *memcg,
                goto out_unlock;
 
        cgroup_name(css->cgroup, memcg_name_buf, sizeof(memcg_name_buf));
-       cache_name = kasprintf(GFP_KERNEL, "%s(%d:%s)", root_cache->name,
-                              css->id, memcg_name_buf);
+       cache_name = kasprintf(GFP_KERNEL, "%s(%llu:%s)", root_cache->name,
+                              css->serial_nr, memcg_name_buf);
        if (!cache_name)
                goto out_unlock;