6 files changed, 14 insertions, 12 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,
 
         down_write(&current->mm->mmap_sem);
 
-        locked     = npages + current->mm->locked_vm;
+        locked     = npages + current->mm->pinned_vm;
         lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
 
         if ((locked > lock_limit) && !capable(CAP_IPC_LOCK)) {
@@ -206,7 +206,7 @@ out:
                 __ib_umem_release(context->device, umem, 0);
                 kfree(umem);
         } else
-                current->mm->locked_vm = locked;
+                current->mm->pinned_vm = locked;
 
         up_write(&current->mm->mmap_sem);
         if (vma_list)
@@ -222,7 +222,7 @@ static void ib_umem_account(struct work_struct *work)
         struct ib_umem *umem = container_of(work, struct ib_umem, work);
 
         down_write(&umem->mm->mmap_sem);
-        umem->mm->locked_vm -= umem->diff;
+        umem->mm->pinned_vm -= umem->diff;
         up_write(&umem->mm->mmap_sem);
         mmput(umem->mm);
         kfree(umem);
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
index cfed5399f074..dc66c4506916 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -79,7 +79,7 @@ static int __ipath_get_user_pages(unsigned long start_page, size_t num_pages,
                         goto bail_release;
         }
 
-        current->mm->locked_vm += num_pages;
+        current->mm->pinned_vm += num_pages;
 
         ret = 0;
         goto bail;
@@ -178,7 +178,7 @@ void ipath_release_user_pages(struct page **p, size_t num_pages)
 
         __ipath_release_user_pages(p, num_pages, 1);
 
-        current->mm->locked_vm -= num_pages;
+        current->mm->pinned_vm -= num_pages;
 
         up_write(&current->mm->mmap_sem);
 }
@@ -195,7 +195,7 @@ static void user_pages_account(struct work_struct *_work)
                 container_of(_work, struct ipath_user_pages_work, work);
 
         down_write(&work->mm->mmap_sem);
-        work->mm->locked_vm -= work->num_pages;
+        work->mm->pinned_vm -= work->num_pages;
         up_write(&work->mm->mmap_sem);
         mmput(work->mm);
         kfree(work);
diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c
index 7689e49c13c9..2bc1d2b96298 100644
--- a/drivers/infiniband/hw/qib/qib_user_pages.c
+++ b/drivers/infiniband/hw/qib/qib_user_pages.c
@@ -74,7 +74,7 @@ static int __qib_get_user_pages(unsigned long start_page, size_t num_pages,
                         goto bail_release;
         }
 
-        current->mm->locked_vm += num_pages;
+        current->mm->pinned_vm += num_pages;
 
         ret = 0;
         goto bail;
@@ -151,7 +151,7 @@ void qib_release_user_pages(struct page **p, size_t num_pages)
         __qib_release_user_pages(p, num_pages, 1);
 
         if (current->mm) {
-                current->mm->locked_vm -= num_pages;
+                current->mm->pinned_vm -= num_pages;
                 up_write(&current->mm->mmap_sem);
         }
 }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index c7d4ee663f14..e418c5abdb0e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -44,6 +44,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 "VmPeak:\t%8lu kB\n"
                 "VmSize:\t%8lu kB\n"
                 "VmLck:\t%8lu kB\n"
+                "VmPin:\t%8lu kB\n"
                 "VmHWM:\t%8lu kB\n"
                 "VmRSS:\t%8lu kB\n"
                 "VmData:\t%8lu kB\n"
@@ -55,6 +56,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                 hiwater_vm << (PAGE_SHIFT-10),
                 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
                 mm->locked_vm << (PAGE_SHIFT-10),
+                mm->pinned_vm << (PAGE_SHIFT-10),
                 hiwater_rss << (PAGE_SHIFT-10),
                 total_rss << (PAGE_SHIFT-10),
                 data << (PAGE_SHIFT-10),
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 6456624aa964..f3175830cc73 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -304,7 +304,7 @@ struct mm_struct {
         unsigned long hiwater_rss;      /* High-watermark of RSS usage */
         unsigned long hiwater_vm;       /* High-water virtual memory usage */
 
-        unsigned long total_vm, locked_vm, shared_vm, exec_vm;
+        unsigned long total_vm, locked_vm, pinned_vm, shared_vm, exec_vm;
         unsigned long stack_vm, reserved_vm, def_flags, nr_ptes;
         unsigned long start_code, end_code, start_data, end_data;
         unsigned long start_brk, brk, start_stack;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index d1a1bee35228..12a0287e0358 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3544,7 +3544,7 @@ static void perf_mmap_close(struct vm_area_struct *vma)
                 struct ring_buffer *rb = event->rb;
 
                 atomic_long_sub((size >> PAGE_SHIFT) + 1, &user->locked_vm);
-                vma->vm_mm->locked_vm -= event->mmap_locked;
+                vma->vm_mm->pinned_vm -= event->mmap_locked;
                 rcu_assign_pointer(event->rb, NULL);
                 mutex_unlock(&event->mmap_mutex);
 
@@ -3625,7 +3625,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
 
         lock_limit = rlimit(RLIMIT_MEMLOCK);
         lock_limit >>= PAGE_SHIFT;
-        locked = vma->vm_mm->locked_vm + extra;
+        locked = vma->vm_mm->pinned_vm + extra;
 
         if ((locked > lock_limit) && perf_paranoid_tracepoint_raw() &&
                 !capable(CAP_IPC_LOCK)) {
@@ -3651,7 +3651,7 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma)
         atomic_long_add(user_extra, &user->locked_vm);
         event->mmap_locked = extra;
         event->mmap_user = get_current_user();
-        vma->vm_mm->locked_vm += event->mmap_locked;
+        vma->vm_mm->pinned_vm += event->mmap_locked;
 
 unlock:
         if (!ret)