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