diff --git a/[refs] b/[refs] index b214684997c7..c2b530ae5180 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84e554e6865c4f4ae84d38800cf270b9a67901cc +refs/heads/master: 7738dd9e8f2bc1c249e00c9c20e018448fac0084 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index bddae72f6f49..8fbb2fd70b64 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2641,7 +2641,7 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags) if (slab_state >= SYSFS) slabflags |= __SYSFS_ADD_DEFERRED; - if (!s || !text || !kmem_cache_open(s, flags, text, + if (!text || !kmem_cache_open(s, flags, text, realsize, ARCH_KMALLOC_MINALIGN, slabflags, NULL)) { s->size = 0; kfree(text);