From 2b5ca582bff950a66999fc5650e2a352e9c20384 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 19 Jul 2007 13:17:15 -0700
Subject: [PATCH] --- yaml --- r: 61765 b: refs/heads/master c:
 a5c96d8a1c67f31ef48935a78da2d2076513842b h: refs/heads/master i:   61763:
 f7626de1336a7398f208bd8fa3013476f238f1d1 v: v3

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

diff --git a/[refs] b/[refs]
index aeeea5fb7e05..f0818a2f52e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce8c2293be47999584908069e78bf6d94beadc53
+refs/heads/master: a5c96d8a1c67f31ef48935a78da2d2076513842b
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 88bc6336ce3d..c3feeaab3875 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -3690,8 +3690,8 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
 	 * functions.
 	 */
 	cachep = __find_general_cachep(size, flags);
-	if (unlikely(cachep == NULL))
-		return NULL;
+	if (unlikely(ZERO_OR_NULL_PTR(cachep)))
+		return cachep;
 	return __cache_alloc(cachep, flags, caller);
 }