diff --git a/[refs] b/[refs] index c7f36638968d..a81d7d30967f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1abd727ed7abf5c19e7d1760671475cbecbccb0e +refs/heads/master: 1800782016fda6fbc9990a0227fec581070f23af diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index b39c8a69a4ff..5e3e8bc9838f 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2522,7 +2522,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size, struct kmem_cache *s; down_write(&slub_lock); - s = find_mergeable(size, align, flags, dtor, ctor); + s = find_mergeable(size, align, flags, ctor, dtor); if (s) { s->refcount++; /*