1 files changed, 4 insertions, 37 deletions

diff --git a/arch/powerpc/mm/book3s64/iommu_api.c b/arch/powerpc/mm/book3s64/iommu_api.c
index 90ee3a89722c..b056cae3388b 100644
--- a/arch/powerpc/mm/book3s64/iommu_api.c
+++ b/arch/powerpc/mm/book3s64/iommu_api.c
@@ -14,6 +14,7 @@
 #include <linux/hugetlb.h>
 #include <linux/swap.h>
 #include <linux/sizes.h>
+#include <linux/mm.h>
 #include <asm/mmu_context.h>
 #include <asm/pte-walk.h>
 #include <linux/mm_inline.h>
@@ -46,40 +47,6 @@ struct mm_iommu_table_group_mem_t {
         u64 dev_hpa;            /* Device memory base address */
 };
 
-static long mm_iommu_adjust_locked_vm(struct mm_struct *mm,
-                unsigned long npages, bool incr)
-{
-        long ret = 0, locked, lock_limit;
-
-        if (!npages)
-                return 0;
-
-        down_write(&mm->mmap_sem);
-
-        if (incr) {
-                locked = mm->locked_vm + npages;
-                lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
-                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
-                        ret = -ENOMEM;
-                else
-                        mm->locked_vm += npages;
-        } else {
-                if (WARN_ON_ONCE(npages > mm->locked_vm))
-                        npages = mm->locked_vm;
-                mm->locked_vm -= npages;
-        }
-
-        pr_debug("[%d] RLIMIT_MEMLOCK HASH64 %c%ld %ld/%ld\n",
-                        current ? current->pid : 0,
-                        incr ? '+' : '-',
-                        npages << PAGE_SHIFT,
-                        mm->locked_vm << PAGE_SHIFT,
-                        rlimit(RLIMIT_MEMLOCK));
-        up_write(&mm->mmap_sem);
-
-        return ret;
-}
-
 bool mm_iommu_preregistered(struct mm_struct *mm)
 {
         return !list_empty(&mm->context.iommu_group_mem_list);
@@ -96,7 +63,7 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,
         unsigned long entry, chunk;
 
         if (dev_hpa == MM_IOMMU_TABLE_INVALID_HPA) {
-                ret = mm_iommu_adjust_locked_vm(mm, entries, true);
+                ret = account_locked_vm(mm, entries, true);
                 if (ret)
                         return ret;
 
@@ -211,7 +178,7 @@ free_exit:
         kfree(mem);
 
 unlock_exit:
-        mm_iommu_adjust_locked_vm(mm, locked_entries, false);
+        account_locked_vm(mm, locked_entries, false);
 
         return ret;
 }
@@ -311,7 +278,7 @@ long mm_iommu_put(struct mm_struct *mm, struct mm_iommu_table_group_mem_t *mem)
 unlock_exit:
         mutex_unlock(&mem_list_mutex);
 
-        mm_iommu_adjust_locked_vm(mm, unlock_entries, false);
+        account_locked_vm(mm, unlock_entries, false);
 
         return ret;
 }