Re: [PATCH linux-next-20110718] Fix build error at mm/slab.c .

From: Pekka Enberg
Date: Wed Jul 20 2011 - 13:37:26 EST


On Wed, 20 Jul 2011, Christoph Lameter wrote:

On Wed, 20 Jul 2011, Pekka Enberg wrote:

+++ linux-3.0-next/mm/slab.c
@@ -3153,12 +3153,9 @@ static void *cache_alloc_debugcheck_afte
objp += obj_offset(cachep);
if (cachep->ctor && cachep->flags & SLAB_POISON)
cachep->ctor(objp);
-#if ARCH_SLAB_MINALIGN
- if ((u32)objp & (ARCH_SLAB_MINALIGN-1)) {
+ if (ARCH_SLAB_MINALIGN && ((u32)objp & (ARCH_SLAB_MINALIGN-1)))
printk(KERN_ERR "0x%p: not aligned to
ARCH_SLAB_MINALIGN=%d\n",
objp, ARCH_SLAB_MINALIGN);
- }
-#endif
return objp;

Looks good to me. Christoph?

Looks okay but I thought you already had a patch that took out the #if
there?

Indeed. Tetsuo, it's commit c225150 ("slab: fix DEBUG_SLAB build") in slab.git. It should appear in linux-next soon.

Pekka

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/