1 files changed, 5 insertions, 3 deletions

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 35b92d81692f..f08bd31c1081 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -11,13 +11,14 @@
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
 #include <linux/swap.h>
+#include <linux/sched/mm.h>
 #include <linux/swapops.h>
 #include <linux/mmu_notifier.h>
 #include <linux/page_idle.h>
 #include <linux/shmem_fs.h>
 
 #include <asm/elf.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/tlbflush.h>
 #include "internal.h"
 
@@ -167,7 +168,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
                 return ERR_PTR(-ESRCH);
 
         mm = priv->mm;
-        if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+        if (!mm || !mmget_not_zero(mm))
                 return NULL;
 
         down_read(&mm->mmap_sem);
@@ -1352,7 +1353,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
         unsigned long end_vaddr;
         int ret = 0, copied = 0;
 
-        if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+        if (!mm || !mmget_not_zero(mm))
                 goto out;
 
         ret = -EINVAL;
@@ -1588,6 +1589,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr,
 
         } while (pte++, addr += PAGE_SIZE, addr != end);
         pte_unmap_unlock(orig_pte, ptl);
+        cond_resched();
         return 0;
 }
 #ifdef CONFIG_HUGETLB_PAGE