mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool

[linux-beck.git] / mm / util.c

diff --git a/mm/util.c b/mm/util.c
index 13467e043e9e24b1d0c6f92560b33f8861f58eca..3704bf1bef9409ee1b48c8ae8867b1383b6a41f2 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -355,7 +355,7 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
 {
        unsigned long ret;
        struct mm_struct *mm = current->mm;
-       bool populate;
+       unsigned long populate;
 
        ret = security_mmap_file(file, prot, flag);
        if (!ret) {
@@ -363,8 +363,8 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
                ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff,
                                    &populate);
                up_write(&mm->mmap_sem);
-               if (!IS_ERR_VALUE(ret) && populate)
-                       mm_populate(ret, len);
+               if (populate)
+                       mm_populate(ret, populate);
        }
        return ret;
 }