diff --git a/[refs] b/[refs]
index 7f3bfcc400aa..d7d9f32d2c2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae20bfda6813387af18c7fdbc0f8b1fa7be2d05b
+refs/heads/master: d8b42bf54be18b5d0bad941b3a1d3e8f022651a7
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 09b5dc82df58..72f5f4ecd1d2 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2129,6 +2129,14 @@ static int calculate_sizes(struct kmem_cache *s)
 	unsigned long size = s->objsize;
 	unsigned long align = s->align;
 
+	/*
+	 * Round up object size to the next word boundary. We can only
+	 * place the free pointer at word boundaries and this determines
+	 * the possible location of the free pointer.
+	 */
+	size = ALIGN(size, sizeof(void *));
+
+#ifdef CONFIG_SLUB_DEBUG
 	/*
 	 * Determine if we can poison the object itself. If the user of
 	 * the slab may touch the object after free or before allocation
@@ -2140,14 +2148,7 @@ static int calculate_sizes(struct kmem_cache *s)
 	else
 		s->flags &= ~__OBJECT_POISON;
 
-	/*
-	 * Round up object size to the next word boundary. We can only
-	 * place the free pointer at word boundaries and this determines
-	 * the possible location of the free pointer.
-	 */
-	size = ALIGN(size, sizeof(void *));
 
-#ifdef CONFIG_SLUB_DEBUG
 	/*
 	 * If we are Redzoning then check if there is some space between the
 	 * end of the object and the free pointer. If not then add an