From: Bryan O'Sullivan <bos@pathscale.com>
Date: Sat, 1 Jul 2006 11:36:15 +0000 (-0700)
Subject: [PATCH] IB/ipath: remove some #if 0 code related to lockable memory
X-Git-Tag: v2.6.18-rc1~211
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3e0018bc74275ab99d223fb5dca0b65067a5ffc1;p=linux-2.6-omap-h63xx.git

[PATCH] IB/ipath: remove some #if 0 code related to lockable memory

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 7393b3a8d41..e32fca9faf8 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/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;