From ef93a31d248518bae60584c97d2ea54e85bed9d3 Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@pathscale.com>
Date: Sat, 1 Jul 2006 04:36:15 -0700
Subject: [PATCH] --- yaml --- r: 31571 b: refs/heads/master c:
 3e0018bc74275ab99d223fb5dca0b65067a5ffc1 h: refs/heads/master i:   31569:
 9f1894bd86681acbc2b5816930aed7d3f907810c   31567:
 c8a01fd91dd829b3e2901e41dc905957ca54fdde v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/infiniband/hw/ipath/ipath_user_pages.c | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 33282b439fd8..c42038d8c6d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35783ec07c3f7f6902abe4433e7be1b664d0bbaf
+refs/heads/master: 3e0018bc74275ab99d223fb5dca0b65067a5ffc1
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_user_pages.c b/trunk/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 7393b3a8d419..e32fca9faf80 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -58,17 +58,6 @@ static int __get_user_pages(unsigned long start_page, size_t num_pages,
 	size_t got;
 	int ret;
 
-#if 0
-	/*
-	 * XXX - causes MPI programs to fail, haven't had time to check
-	 * yet
-	 */
-	if (!capable(CAP_IPC_LOCK)) {
-		ret = -EPERM;
-		goto bail;
-	}
-#endif
-
 	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
 		PAGE_SHIFT;