diff options
| author | Michel Lespinasse <walken@google.com> | 2013-02-22 16:35:55 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-23 17:50:22 -0800 | 
| commit | 28a35716d317980ae9bc2ff2f84c33a3cda9e884 (patch) | |
| tree | a69307192d34334c6869cfe33b6fea4e358de718 /include/linux/hugetlb.h | |
| parent | e0fb58152955142f48ed31c8c0541b53e094da6b (diff) | |
| download | olio-linux-3.10-28a35716d317980ae9bc2ff2f84c33a3cda9e884.tar.xz olio-linux-3.10-28a35716d317980ae9bc2ff2f84c33a3cda9e884.zip  | |
mm: use long type for page counts in mm_populate() and get_user_pages()
Use long type for page counts in mm_populate() so as to avoid integer
overflow when running the following test code:
int main(void) {
  void *p = mmap(NULL, 0x100000000000, PROT_READ,
                 MAP_PRIVATE | MAP_ANON, -1, 0);
  printf("p: %p\n", p);
  mlockall(MCL_CURRENT);
  printf("done\n");
  return 0;
}
Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/hugetlb.h')
| -rw-r--r-- | include/linux/hugetlb.h | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 0c80d3f57a5..eedc334fb6f 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -43,9 +43,9 @@ int hugetlb_mempolicy_sysctl_handler(struct ctl_table *, int,  #endif  int copy_hugetlb_page_range(struct mm_struct *, struct mm_struct *, struct vm_area_struct *); -int follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, -			struct page **, struct vm_area_struct **, -			unsigned long *, int *, int, unsigned int flags); +long follow_hugetlb_page(struct mm_struct *, struct vm_area_struct *, +			 struct page **, struct vm_area_struct **, +			 unsigned long *, unsigned long *, long, unsigned int);  void unmap_hugepage_range(struct vm_area_struct *,  			  unsigned long, unsigned long, struct page *);  void __unmap_hugepage_range_final(struct mmu_gather *tlb,  |