From 9a707699700d5edb3b50340d1f74962e9e840378 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 9 May 2007 02:32:36 -0700
Subject: [PATCH] --- yaml --- r: 55277 b: refs/heads/master c:
 be7b3fbcef34452127bed93632b8e788f685d70e h: refs/heads/master i:   55275:
 82c573dd7f97e06fe9bea00b3f2e62bfc0b4c1ae v: v3

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

diff --git a/[refs] b/[refs]
index db01c78f6204..5bffbc2b2e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65c02d4cfbbd10188ded3d6577922ab034d943ba
+refs/heads/master: be7b3fbcef34452127bed93632b8e788f685d70e
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 40e92d8d4bc6..beac34a5e4fd 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -1661,7 +1661,7 @@ static int calculate_sizes(struct kmem_cache *s)
 		 */
 		size += 2 * sizeof(struct track);
 
-	if (flags & DEBUG_DEFAULT_FLAGS)
+	if (flags & SLAB_RED_ZONE)
 		/*
 		 * Add some empty padding so that we can catch
 		 * overwrites from earlier objects rather than let