From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932356AbWF2Vrz (ORCPT ); Thu, 29 Jun 2006 17:47:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932930AbWF2Vrl (ORCPT ); Thu, 29 Jun 2006 17:47:41 -0400 Received: from mx.pathscale.com ([64.160.42.68]:40079 "EHLO mx.pathscale.com") by vger.kernel.org with ESMTP id S932914AbWF2VoK (ORCPT ); Thu, 29 Jun 2006 17:44:10 -0400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 35 of 39] IB/ipath - remove some #if 0 code related to lockable memory X-Mercurial-Node: 9b423c45af8b2eb98562c298d785a0e0fe066b5b Message-Id: <9b423c45af8b2eb98562.1151617286@eng-12.pathscale.com> In-Reply-To: Date: Thu, 29 Jun 2006 14:41:26 -0700 From: "Bryan O'Sullivan" To: akpm@osdl.org, rdreier@cisco.com, mst@mellanox.co.il Cc: openib-general@openib.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Dave Olson Signed-off-by: Bryan O'Sullivan diff -r b6ebaf2dd2fd -r 9b423c45af8b drivers/infiniband/hw/ipath/ipath_user_pages.c --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c Thu Jun 29 14:33:26 2006 -0700 +++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c Thu Jun 29 14:33:26 2006 -0700 @@ -57,17 +57,6 @@ static int __get_user_pages(unsigned lon unsigned long lock_limit; 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;