diff options
Diffstat (limited to 'drivers/infiniband/core/umem.c')
| -rw-r--r-- | drivers/infiniband/core/umem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index b645e558876f..9155f91d66bf 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c | |||
| @@ -136,7 +136,7 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, | |||
| 136 | 136 | ||
| 137 | down_write(¤t->mm->mmap_sem); | 137 | down_write(¤t->mm->mmap_sem); |
| 138 | 138 | ||
| 139 | locked = npages + current->mm->locked_vm; | 139 | locked = npages + current->mm->pinned_vm; |
| 140 | lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT; | 140 | lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT; |
| 141 | 141 | ||
| 142 | if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) { | 142 | if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) { |
| @@ -206,7 +206,7 @@ out: | |||
| 206 | __ib_umem_release(context->device, umem, 0); | 206 | __ib_umem_release(context->device, umem, 0); |
| 207 | kfree(umem); | 207 | kfree(umem); |
| 208 | } else | 208 | } else |
| 209 | current->mm->locked_vm = locked; | 209 | current->mm->pinned_vm = locked; |
| 210 | 210 | ||
| 211 | up_write(¤t->mm->mmap_sem); | 211 | up_write(¤t->mm->mmap_sem); |
| 212 | if (vma_list) | 212 | if (vma_list) |
| @@ -222,7 +222,7 @@ static void ib_umem_account(struct work_struct *work) | |||
| 222 | struct ib_umem *umem = container_of(work, struct ib_umem, work); | 222 | struct ib_umem *umem = container_of(work, struct ib_umem, work); |
| 223 | 223 | ||
| 224 | down_write(&umem->mm->mmap_sem); | 224 | down_write(&umem->mm->mmap_sem); |
| 225 | umem->mm->locked_vm -= umem->diff; | 225 | umem->mm->pinned_vm -= umem->diff; |
| 226 | up_write(&umem->mm->mmap_sem); | 226 | up_write(&umem->mm->mmap_sem); |
| 227 | mmput(umem->mm); | 227 | mmput(umem->mm); |
| 228 | kfree(umem); | 228 | kfree(umem); |
