From 267d595e74395e14d1d5d52d30da75861c21fc9a Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux.com>
Date: Fri, 22 Jul 2011 09:35:14 -0500
Subject: [PATCH] --- yaml --- r: 261663 b: refs/heads/master c:
 9e577e8b46ab0c38970c0f0cd7eae62e6dffddee h: refs/heads/master i:   261661:
 d35d847f3ddc5b7952d30b6a98271b6b2e4f8fab   261659:
 040badf0b9499344f49cfcacd3d94bdcf888a867   261655:
 bc5364b907860b245ec0826743abe96f69e7eb2d   261647:
 24cd2e4592c904ebbb80ca3d9177bbe6c236f419   261631:
 c895bafff9335b1ef175ec73b0a8a6d9dde66c19 v: v3

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

diff --git a/[refs] b/[refs]
index f4bb5ee3ff3d..34ebd220ae9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d07171c5e58e68a76a141970a3a5e816a414ce6
+refs/heads/master: 9e577e8b46ab0c38970c0f0cd7eae62e6dffddee
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 7836b45ea1fa..e842c19e67fb 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2082,6 +2082,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
 		stat(s, ALLOC_SLAB);
 		c->node = page_to_nid(page);
 		c->page = page;
+
+		if (kmem_cache_debug(s))
+			goto debug;
 		goto load_freelist;
 	}
 	if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())