diff --git a/[refs] b/[refs]
index 5e1425ba069c..7dd6c3fa619a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 788e1aadadd0d5a9cbffce10c34840b4072bc733
+refs/heads/master: 608da7e3fc7259eca0d983b31bc8915af14cf15e
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index d011030e9613..c4f6e14c2c71 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2492,8 +2492,9 @@ __kmem_cache_create (const char *name, size_t size, size_t align,
 	}
 #if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
 	if (size >= malloc_sizes[INDEX_L3 + 1].cs_size
-	    && cachep->object_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) {
-		cachep->obj_offset += PAGE_SIZE - ALIGN(size, align);
+	    && cachep->object_size > cache_line_size()
+	    && ALIGN(size, cachep->align) < PAGE_SIZE) {
+		cachep->obj_offset += PAGE_SIZE - ALIGN(size, cachep->align);
 		size = PAGE_SIZE;
 	}
 #endif