mm: make minimum slab alignment a runtime property

[sfrench/cifs-2.6.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 0edb474edef1839662d4e1a4edeacfceea14bb41..8fb259511305c3d6d9e6f12e99d248e306b41c1c 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3009,10 +3009,9 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep,
        objp += obj_offset(cachep);
        if (cachep->ctor && cachep->flags & SLAB_POISON)
                cachep->ctor(objp);
-       if (ARCH_SLAB_MINALIGN &&
-           ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1))) {
-               pr_err("0x%px: not aligned to ARCH_SLAB_MINALIGN=%d\n",
-                      objp, (int)ARCH_SLAB_MINALIGN);
+       if ((unsigned long)objp & (arch_slab_minalign() - 1)) {
+               pr_err("0x%px: not aligned to arch_slab_minalign()=%u\n", objp,
+                      arch_slab_minalign());
        }
        return objp;
 }