summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMichel Lespinasse <walken@google.com>2013-02-07 12:26:19 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-14 15:25:13 +1100
commit27b1b8a87059ee0d4db8ae2c4d8ca13b2f7a8e4c (patch)
treea08f4d95f67d37b23a7efb9086410b85890f31e6 /include/linux
parent23d0c77f2d53193f0318d88ce313fcbf6c6d3a17 (diff)
mm: remove flags argument to mmap_region
After the MAP_POPULATE handling has been moved to mmap_region() call sites, the only remaining use of the flags argument is to pass the MAP_NORESERVE flag. This can be just as easily handled by do_mmap_pgoff(), so do that and remove the mmap_region() flags parameter. Signed-off-by: Michel Lespinasse <walken@google.com> Acked-by: Rik van Riel <riel@redhat.com> Tested-by: Andy Lutomirski <luto@amacapital.net> Cc: Greg Ungerer <gregungerer@westnet.com.au> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mm.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 0ace5feea4c4..bca956e58715 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1474,8 +1474,7 @@ extern int install_special_mapping(struct mm_struct *mm,
extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
extern unsigned long mmap_region(struct file *file, unsigned long addr,
- unsigned long len, unsigned long flags,
- vm_flags_t vm_flags, unsigned long pgoff);
+ unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot, unsigned long flags,
unsigned long pgoff, bool *populate);