The patch titled IB/ipath: remove some #if 0 code related to lockable memory has been removed from the -mm tree. Its filename is ib-ipath-remove-some-if-0-code-related-to.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: IB/ipath: remove some #if 0 code related to lockable memory From: "Bryan O'Sullivan" <bos@xxxxxxxxxxxxx> Signed-off-by: Dave Olson <dave.olson@xxxxxxxxxx> Signed-off-by: Bryan O'Sullivan <bryan.osullivan@xxxxxxxxxx> Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> Cc: Roland Dreier <rolandd@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/infiniband/hw/ipath/ipath_user_pages.c | 11 ----------- 1 file changed, 11 deletions(-) diff -puN drivers/infiniband/hw/ipath/ipath_user_pages.c~ib-ipath-remove-some-if-0-code-related-to drivers/infiniband/hw/ipath/ipath_user_pages.c --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c~ib-ipath-remove-some-if-0-code-related-to +++ a/drivers/infiniband/hw/ipath/ipath_user_pages.c @@ -58,17 +58,6 @@ static int __get_user_pages(unsigned lon 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; _ Patches currently in -mm which might be from bos@xxxxxxxxxxxxx are origin.patch ib-ipath-fixes-a-bug-where-our-delay-for-eeprom-no.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html