aboutsummaryrefslogtreecommitdiffstats
path: root/mm/mmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/mmap.c')
-rw-r--r--mm/mmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/mmap.c b/mm/mmap.c
index 39a3944e1658..44bb4d869884 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1163,13 +1163,13 @@ static inline unsigned long round_hint_to_min(unsigned long hint)
1163unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, 1163unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
1164 unsigned long len, unsigned long prot, 1164 unsigned long len, unsigned long prot,
1165 unsigned long flags, unsigned long pgoff, 1165 unsigned long flags, unsigned long pgoff,
1166 bool *populate) 1166 unsigned long *populate)
1167{ 1167{
1168 struct mm_struct * mm = current->mm; 1168 struct mm_struct * mm = current->mm;
1169 struct inode *inode; 1169 struct inode *inode;
1170 vm_flags_t vm_flags; 1170 vm_flags_t vm_flags;
1171 1171
1172 *populate = false; 1172 *populate = 0;
1173 1173
1174 /* 1174 /*
1175 * Does the application expect PROT_READ to imply PROT_EXEC? 1175 * Does the application expect PROT_READ to imply PROT_EXEC?
@@ -1307,7 +1307,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
1307 1307
1308 addr = mmap_region(file, addr, len, vm_flags, pgoff); 1308 addr = mmap_region(file, addr, len, vm_flags, pgoff);
1309 if (!IS_ERR_VALUE(addr) && (vm_flags & VM_POPULATE)) 1309 if (!IS_ERR_VALUE(addr) && (vm_flags & VM_POPULATE))
1310 *populate = true; 1310 *populate = len;
1311 return addr; 1311 return addr;
1312} 1312}
1313 1313