Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus

[firefly-linux-kernel-4.4.55.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 3a6e0cfdf03add7f19f4dc9ebdf7cc8bf6fad695..dcdab81bd240bafe3bec02cb32bf3390763a90e9 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -93,16 +93,6 @@ static int kmem_cache_sanity_check(const char *name, size_t size)
                               s->object_size);
                        continue;
                }
-
-#if !defined(CONFIG_SLUB)
-               if (!strcmp(s->name, name)) {
-                       pr_err("%s (%s): Cache name already exists.\n",
-                              __func__, name);
-                       dump_stack();
-                       s = NULL;
-                       return -EINVAL;
-               }
-#endif
        }
 
        WARN_ON(strchr(name, ' '));     /* It confuses parsers */
@@ -269,6 +259,10 @@ struct kmem_cache *find_mergeable(size_t size, size_t align,
                if (s->size - size >= sizeof(void *))
                        continue;
 
+               if (IS_ENABLED(CONFIG_SLAB) && align &&
+                       (align > s->align || s->align % align))
+                       continue;
+
                return s;
        }
        return NULL;