Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/slub.c b/mm/slub.c
index b39c8a69a4ff..5e3e8bc9838f 100644
--- a/mm/slub.c
+++ b/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++;
                 /*