From 21894eb4abdb617d320add9bfa5b61f1906e53f7 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 22 May 2008 19:22:25 +0300
Subject: [PATCH] --- yaml --- r: 97387 b: refs/heads/master c:
 76994412f8e824e79a593d6777ec327d85f942b2 h: refs/heads/master i:   97385:
 9968149b0bdc5a22c782ae90e2332e64b14e38fa   97383:
 6d6cd59b97a41fdcabd18b7d6e537a17bd9cd64c v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 65b624142bd7..b291cf74cb49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 239f49c0800778c863585a103805c58afbad6748
+refs/heads/master: 76994412f8e824e79a593d6777ec327d85f942b2
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index a505a828ef41..0987d1cd943c 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2726,9 +2726,10 @@ size_t ksize(const void *object)
 
 	page = virt_to_head_page(object);
 
-	if (unlikely(!PageSlab(page)))
+	if (unlikely(!PageSlab(page))) {
+		WARN_ON(!PageCompound(page));
 		return PAGE_SIZE << compound_order(page);
-
+	}
 	s = page->slab;
 
 #ifdef CONFIG_SLUB_DEBUG