From 54b2f80cda06c9878159cca65929ab096d897259 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 29 Sep 2010 21:02:13 +0900
Subject: [PATCH] --- yaml --- r: 215953 b: refs/heads/master c:
 a5dd5c117cbf620378d693963ffc42239297fac4 h: refs/heads/master i:   215951:
 316206674a9f4abef17cd6d8372a8e7d2ae5ac8c v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 82985d1650ec..569228fda837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62e346a83026a28526fc9799337bcc6154819f25
+refs/heads/master: a5dd5c117cbf620378d693963ffc42239297fac4
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index aad00ba486f2..ac236b1ced16 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2433,9 +2433,8 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
 #ifdef CONFIG_SLUB_DEBUG
 	void *addr = page_address(page);
 	void *p;
-	long *map = kzalloc(BITS_TO_LONGS(page->objects) * sizeof(long),
-			    GFP_ATOMIC);
-
+	unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
+				     sizeof(long), GFP_ATOMIC);
 	if (!map)
 		return;
 	slab_err(s, page, "%s", text);
@@ -3660,7 +3659,7 @@ static int add_location(struct loc_track *t, struct kmem_cache *s,
 
 static void process_slab(struct loc_track *t, struct kmem_cache *s,
 		struct page *page, enum track_item alloc,
-		long *map)
+		unsigned long *map)
 {
 	void *addr = page_address(page);
 	void *p;