---

yaml --- r: 255047 b: refs/heads/master c: c225150 h: refs/heads/master i: 255045: 67487d3 255043: e9aacd1 255039: 1888454 v: v3
git-mirror · Jul 18, 2011 · cc40dfe · cc40dfe
1 parent fd29879
commit cc40dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfa71457a091ac0e4e20cab36e8ebad63935e504
+refs/heads/master: c225150b86fef9f7663219b6e9f7606ea1607312
diff --git a/trunk/mm/slab.c b/trunk/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