From e9f9a469124b283fdc5bc3e5060378ae485be4df Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Fri, 15 Jan 2010 12:49:56 -0800
Subject: [PATCH] --- yaml --- r: 186179 b: refs/heads/master c:
 7738dd9e8f2bc1c249e00c9c20e018448fac0084 h: refs/heads/master i:   186177:
 2bd085936a07f0a6ee5991bc2c2bb853eac3c613   186175:
 237ac15c610baede9e7d01aa97aa8921efe9e281 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);