diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-26 11:31:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-02-26 11:31:31 +1100 |
| commit | fb98a289b1980ca3227f7d8c3557d6bd98f49b4d (patch) | |
| tree | e447faab0dd3b257371ddda4ee87f30df7eb406b /Documentation | |
| parent | ed2cf2b25ce5fabf17dddaf73dc286b3a4258b83 (diff) | |
| parent | bb618451544ca9152a1a213d0a2b93d231c4cce1 (diff) | |
Merge remote-tracking branch 'rdma/for-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/infiniband/user_verbs.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/infiniband/user_verbs.txt b/Documentation/infiniband/user_verbs.txt index df049b9f5b6e..47ebf2f80b2b 100644 --- a/Documentation/infiniband/user_verbs.txt +++ b/Documentation/infiniband/user_verbs.txt @@ -46,11 +46,11 @@ Memory pinning I/O targets be kept resident at the same physical address. The ib_uverbs module manages pinning and unpinning memory regions via get_user_pages() and put_page() calls. It also accounts for the - amount of memory pinned in the process's locked_vm, and checks that + amount of memory pinned in the process's pinned_vm, and checks that unprivileged processes do not exceed their RLIMIT_MEMLOCK limit. Pages that are pinned multiple times are counted each time they are - pinned, so the value of locked_vm may be an overestimate of the + pinned, so the value of pinned_vm may be an overestimate of the number of pages pinned by a process. /dev files |