diff options
| author | Hugh Dickins <hughd@google.com> | 2011-07-11 13:35:08 -0700 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-07-18 15:20:49 +0300 |
| commit | c225150b86fef9f7663219b6e9f7606ea1607312 (patch) | |
| tree | c49c07c9ecaff0a90355fbb79f3e3d262fa5943a /mm | |
| parent | bfa71457a091ac0e4e20cab36e8ebad63935e504 (diff) | |
| download | linux-3.10-c225150b86fef9f7663219b6e9f7606ea1607312.tar.gz linux-3.10-c225150b86fef9f7663219b6e9f7606ea1607312.tar.bz2 linux-3.10-c225150b86fef9f7663219b6e9f7606ea1607312.zip | |
slab: fix DEBUG_SLAB build
Fix CONFIG_SLAB=y CONFIG_DEBUG_SLAB=y build error and warnings.
Now that ARCH_SLAB_MINALIGN defaults to __alignof__(unsigned long long),
it is always defined (when slab.h included), but cannot be used in #if:
mm/slab.c: In function `cache_alloc_debugcheck_after':
mm/slab.c:3156:5: warning: "__alignof__" is not defined
mm/slab.c:3156:5: error: missing binary operator before token "("
make[1]: *** [mm/slab.o] Error 1
So just remove the #if and #endif lines, but then 64-bit build warns:
mm/slab.c: In function `cache_alloc_debugcheck_after':
mm/slab.c:3156:6: warning: cast from pointer to integer of different size
mm/slab.c:3158:10: warning: format `%d' expects type `int', but argument
3 has type `long unsigned int'
Fix those with casts, whatever the actual type of ARCH_SLAB_MINALIGN.
Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/slab.c b/mm/slab.c index bcfa4987c8a..ef8ceb726e7 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3153,12 +3153,10 @@ 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 - if ((u32)objp & (ARCH_SLAB_MINALIGN-1)) { + if ((unsigned long)objp & (ARCH_SLAB_MINALIGN-1)) { printk(KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n", - objp, ARCH_SLAB_MINALIGN); + objp, (int)ARCH_SLAB_MINALIGN); } -#endif return objp; } #else |