Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea466f2 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Pekka Enberg
Browse files

slab: fix DEBUG_SLAB warning 



In commit c225150b "slab: fix DEBUG_SLAB build",
"if ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1))" is always true if
ARCH_SLAB_MINALIGN == 0. Do not print warning if ARCH_SLAB_MINALIGN == 0.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent b56efcf0

mm/slab.c

+2 −1
Original line number Diff line number Diff line
@@ -3155,7 +3155,8 @@ 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 ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1)) {

	if (ARCH_SLAB_MINALIGN &&

	    ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1))) {

		printk(KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n",

		       objp, (int)ARCH_SLAB_MINALIGN);

	}