X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=mm%2Fslab.c;h=dc2f068c0b7d73d822f6826af35f0edf1a4f3c0d;hb=7ea466f2256b02a7047dfd47d76a2f6c1e427e3e;hp=c3cb3598555a4bb53e4cf10587d0a72366d3624d;hpb=b56efcf0a45aa7fc32de90d5f9838541082fbc19;p=pandora-kernel.git

diff --git a/mm/slab.c b/mm/slab.c
index c3cb3598555a..dc2f068c0b7d 100644
--- a/mm/slab.c
+++ b/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);
 	}