diff options
author | Michel Lespinasse <walken@google.com> | 2013-02-22 19:32:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 20:50:11 -0500 |
commit | 41badc15cbad0350de34408c1b0c690f9df76d4b (patch) | |
tree | 2545134398b99b37259bf6412a0bb56442f120fa /include/linux/mm.h | |
parent | 1869305009857cdeaabe6283bcdc2359c5784543 (diff) |
mm: make do_mmap_pgoff return populate as a size in bytes, not as a bool
do_mmap_pgoff() rounds up the desired size to the next PAGE_SIZE
multiple, however there was no equivalent code in mm_populate(), which
caused issues.
This could be fixed by introduced the same rounding in mm_populate(),
however I think it's preferable to make do_mmap_pgoff() return populate
as a size rather than as a boolean, so we don't have to duplicate the
size rounding logic in mm_populate().
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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 9a5fcdeaa3a0..95db68e34b18 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -1475,7 +1475,7 @@ extern unsigned long mmap_region(struct file *file, unsigned long addr, | |||
1475 | unsigned long len, vm_flags_t vm_flags, unsigned long pgoff); | 1475 | unsigned long len, vm_flags_t vm_flags, unsigned long pgoff); |
1476 | extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, | 1476 | extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, |
1477 | unsigned long len, unsigned long prot, unsigned long flags, | 1477 | unsigned long len, unsigned long prot, unsigned long flags, |
1478 | unsigned long pgoff, bool *populate); | 1478 | unsigned long pgoff, unsigned long *populate); |
1479 | extern int do_munmap(struct mm_struct *, unsigned long, size_t); | 1479 | extern int do_munmap(struct mm_struct *, unsigned long, size_t); |
1480 | 1480 | ||
1481 | #ifdef CONFIG_MMU | 1481 | #ifdef CONFIG_MMU |