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