aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@pathscale.com>2006-07-01 07:36:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-01 12:56:01 -0400
commit3e0018bc74275ab99d223fb5dca0b65067a5ffc1 (patch)
treeb1addb04e932a5e58f9269427af0a0502709a271
parent35783ec07c3f7f6902abe4433e7be1b664d0bbaf (diff)
[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>
-rw-r--r--drivers/infiniband/hw/ipath/ipath_user_pages.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index 7393b3a8d419..e32fca9faf80 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,
58 size_t got; 58 size_t got;
59 int ret; 59 int ret;
60 60
61#if 0
62 /*
63 * XXX - causes MPI programs to fail, haven't had time to check
64 * yet
65 */
66 if (!capable(CAP_IPC_LOCK)) {
67 ret = -EPERM;
68 goto bail;
69 }
70#endif
71
72 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> 61 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >>
73 PAGE_SHIFT; 62 PAGE_SHIFT;
74 63