From 8fadfea4f281b7d97bd314bbb5e0acd78428645a Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 23 Sep 2005 13:24:10 -0700
Subject: [PATCH] --- yaml --- r: 9276 b: refs/heads/master c:
 dbdb90450059e17e8e005ebd3ce0a1fd6008a0c8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f93a2eacebfe..eece678d1f4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86513e726b494796175b6c4fdd705797f01b0ca2
+refs/heads/master: dbdb90450059e17e8e005ebd3ce0a1fd6008a0c8
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index ad113c431e39..c9adfce00405 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2907,7 +2907,8 @@ void *__kmalloc(size_t size, unsigned int __nocast flags)
 	 * functions.
 	 */
 	cachep = __find_general_cachep(size, flags);
-	BUG_ON(!cachep);		/* Allocation size too large for kmalloc */
+	if (unlikely(cachep == NULL))
+		return NULL;
 	return __cache_alloc(cachep, flags);
 }
 EXPORT_SYMBOL(__kmalloc);