From 290e15153b9b7d01f49d9e427e8e2f8265db7814 Mon Sep 17 00:00:00 2001 From: Tetsuo Handa Date: Thu, 21 Jul 2011 09:42:45 +0900 Subject: [PATCH] --- yaml --- r: 255049 b: refs/heads/master c: 7ea466f2256b02a7047dfd47d76a2f6c1e427e3e h: refs/heads/master i: 255047: cc40dfe1a5dd0b30b50feebf5ba854fda04e594e v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad71ef135eaf..26660d27bc9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b56efcf0a45aa7fc32de90d5f9838541082fbc19 +refs/heads/master: 7ea466f2256b02a7047dfd47d76a2f6c1e427e3e diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index c3cb3598555a..dc2f068c0b7d 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -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); }