From cc40dfe1a5dd0b30b50feebf5ba854fda04e594e Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Mon, 11 Jul 2011 13:35:08 -0700
Subject: [PATCH] --- yaml --- r: 255047 b: refs/heads/master c:
 c225150b86fef9f7663219b6e9f7606ea1607312 h: refs/heads/master i:   255045:
 67487d33467ea353e1e7f13319890685bef4e54f   255043:
 e9aacd1b05e72711d6fbb401737a4afc360a506a   255039:
 18884543122c9726bce47f29eebc9dc5a8fa28c2 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d8c94de25204..5a727e558f27 100644
--- 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
index bcfa4987c8ae..ef8ceb726e71 100644
--- 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