From ac1f6af78eeb9f68a3ba21774bb8079c8346e036 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@engr.sgi.com>
Date: Thu, 22 Sep 2005 21:44:10 -0700
Subject: [PATCH] --- yaml --- r: 9240 b: refs/heads/master c:
 eafb42707b21beb42bba4eae7b742f837ee9d2e0 h: refs/heads/master v: v3

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

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