diff --git a/[refs] b/[refs] index acae6dcf24d7..ccc892ad3cc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e09e6e2b6a5daf653794926ab50a784b14b6de53 +refs/heads/master: 85ba94ba0592296053f7f2846812173424afe1cb diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c index 4c82dd41f32e..62b679dc660f 100644 --- a/trunk/mm/slob.c +++ b/trunk/mm/slob.c @@ -515,7 +515,7 @@ size_t ksize(const void *block) sp = (struct slob_page *)virt_to_page(block); if (slob_page(sp)) - return ((slob_t *)block - 1)->units + SLOB_UNIT; + return (((slob_t *)block - 1)->units - 1) * SLOB_UNIT; else return sp->page.private; }