Merge commit 'linus/master' into sched-fixes-for-linus

1 files changed, 3 insertions, 2 deletions

diff --git a/mm/slub.c b/mm/slub.c
index a505a828ef41..0987d1cd943c 100644
--- a/mm/slub.c
+++ b/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