---

yaml --- r: 186179 b: refs/heads/master c: 7738dd9 h: refs/heads/master i: 186177: 2bd0859 186175: 237ac15 v: v3
git-mirror · Jan 22, 2010 · e9f9a46 · e9f9a46
1 parent 2c2d480
commit e9f9a46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);