From 311cac0b3d32d77ad4f1aebf3e2c14713dc46381 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 9 Oct 2007 19:59:04 -0700
Subject: [PATCH] --- yaml --- r: 67087 b: refs/heads/master c:
 65d470b3ea52ee1402499d6fcb4632296452e5b1 h: refs/heads/master i:   67085:
 3b16cd544c6a3b1f5bacaed89e4163717b19911a   67083:
 57e7ac15bf1ac0277e39fd3c0b235b5b69963e36   67079:
 46a70420864fbab123b3034392f19e9e68e93066   67071:
 b1e4fa7a52ca17fd29b2f01631c0da1c03f0e270 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/infiniband/core/device.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2949b21e7e22..158d97a3036c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce423ef50ee1b6b7db63c748034423aa0afce224
+refs/heads/master: 65d470b3ea52ee1402499d6fcb4632296452e5b1
diff --git a/trunk/drivers/infiniband/core/device.c b/trunk/drivers/infiniband/core/device.c
index 2506c43ba041..5ac5ffee05cb 100644
--- a/trunk/drivers/infiniband/core/device.c
+++ b/trunk/drivers/infiniband/core/device.c
@@ -120,12 +120,12 @@ static struct ib_device *__ib_device_get_by_name(const char *name)
 
 static int alloc_name(char *name)
 {
-	long *inuse;
+	unsigned long *inuse;
 	char buf[IB_DEVICE_NAME_MAX];
 	struct ib_device *device;
 	int i;
 
-	inuse = (long *) get_zeroed_page(GFP_KERNEL);
+	inuse = (unsigned long *) get_zeroed_page(GFP_KERNEL);
 	if (!inuse)
 		return -ENOMEM;