From fd9c744b6e518930b89171bfdf0fa6627eddb1b4 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Oct 2008 12:23:35 -0700
Subject: [PATCH] --- yaml --- r: 110242 b: refs/heads/master c:
 9283dfed51b223eddf68bdf91c5cddc4a9abbdbe h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slob.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9064acb888a5..9ba8ef89c026 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d5922572038bae9f7b16fcb974eee806727b44c
+refs/heads/master: 9283dfed51b223eddf68bdf91c5cddc4a9abbdbe
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;
 }