diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
| commit | fe8875e5a41a36ef26072cf05731df5493ade0e1 (patch) | |
| tree | 786c31c1e86f5287177210fb469c8ecae0bdd146 /drivers/infiniband/hw/ipath/ipath_user_pages.c | |
| parent | f57721507ffeaf8785f7f17254651de4d8b45e09 (diff) | |
| parent | a265e5587f078618c1f17c3a83da65046f18746f (diff) | |
| download | blackbird-op-linux-fe8875e5a41a36ef26072cf05731df5493ade0e1.tar.gz blackbird-op-linux-fe8875e5a41a36ef26072cf05731df5493ade0e1.zip | |
Merge branch 'misc' into for-next
Conflicts:
drivers/infiniband/core/uverbs_main.c
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_user_pages.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_user_pages.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index 82878e348627..eb7d59abd12d 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c +++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c @@ -59,8 +59,7 @@ static int __get_user_pages(unsigned long start_page, size_t num_pages, size_t got; int ret; - lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur >> - PAGE_SHIFT; + lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT; if (num_pages > lock_limit) { ret = -ENOMEM; |
