---

yaml --- r: 255049 b: refs/heads/master c: 7ea466f h: refs/heads/master i: 255047: cc40dfe v: v3
git-mirror · Jul 22, 2011 · 290e151 · 290e151
1 parent 460f1b7
commit 290e151
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 	}