Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 7f421d0..cf377be 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -539,7 +539,7 @@ size_t __ksize(const void *block)
 
        sp = virt_to_page(block);
        if (unlikely(!PageSlab(sp)))
-               return PAGE_SIZE << compound_order(sp);
+               return page_size(sp);
 
        align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
        m = (unsigned int *)(block - align);