Merge branch 'linus' into x86/quirks

Conflicts:
	arch/x86/kernel/early-quirks.c

1 files changed, 5 insertions, 3 deletions

diff --git a/mm/slob.c b/mm/slob.c
index 4c82dd41f32e..cb675d126791 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -514,9 +514,11 @@ size_t ksize(const void *block)
                 return 0;
 
         sp = (struct slob_page *)virt_to_page(block);
-        if (slob_page(sp))
-                return ((slob_t *)block - 1)->units + SLOB_UNIT;
-        else
+        if (slob_page(sp)) {
+                int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+                unsigned int *m = (unsigned int *)(block - align);
+                return SLOB_UNITS(*m) * SLOB_UNIT;
+        } else
                 return sp->page.private;
 }