diff --git a/[refs] b/[refs]
index 986691dccd34..9296891a0f75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69849375d6b13e94d08cdc94b49b11fbab454a0e
+refs/heads/master: 70096a561d1e09120bae1f293f3632cedbfd5c68
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index 62b679dc660f..cb675d126791 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -514,9 +514,11 @@ size_t ksize(const void *block)
 		return 0;
 
 	sp = (struct slob_page *)virt_to_page(block);
-	if (slob_page(sp))
-		return (((slob_t *)block - 1)->units - 1) * SLOB_UNIT;
-	else
+	if (slob_page(sp)) {
+		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+		unsigned int *m = (unsigned int *)(block - align);
+		return SLOB_UNITS(*m) * SLOB_UNIT;
+	} else
 		return sp->page.private;
 }