aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c
index bcfa4987c8ae..ef8ceb726e71 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3153,12 +3153,10 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep,
3153 objp += obj_offset(cachep); 3153 objp += obj_offset(cachep);
3154 if (cachep->ctor && cachep->flags & SLAB_POISON) 3154 if (cachep->ctor && cachep->flags & SLAB_POISON)
3155 cachep->ctor(objp); 3155 cachep->ctor(objp);
3156#if ARCH_SLAB_MINALIGN 3156 if ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1)) {
3157 if ((u32)objp & (ARCH_SLAB_MINALIGN-1)) {
3158 printk(KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n", 3157 printk(KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n",
3159 objp, ARCH_SLAB_MINALIGN); 3158 objp, (int)ARCH_SLAB_MINALIGN);
3160 } 3159 }
3161#endif
3162 return objp; 3160 return objp;
3163} 3161}
3164#else 3162#else