diff --git a/[refs] b/[refs]
index ab251bb539b9..281db06e6da2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b5ad24878b7e5a543b98c5d2f8c0d8c0dd3088f
+refs/heads/master: 1ab335d8f85792e3b107ff8237d53cf64db714df
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 736e497733d6..dd41b74c8322 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -2330,8 +2330,8 @@ 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->obj_size > cache_line_size() && size < PAGE_SIZE) {
-		cachep->obj_offset += PAGE_SIZE - size;
+	    && cachep->obj_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) {
+		cachep->obj_offset += PAGE_SIZE - ALIGN(size, align);
 		size = PAGE_SIZE;
 	}
 #endif