diff options
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mm/memory.c b/mm/memory.c index 7bd22a621817..bc929dbad215 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1677,15 +1677,15 @@ static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long add | |||
1677 | * instead of __get_user_pages. __get_user_pages should be used only if | 1677 | * instead of __get_user_pages. __get_user_pages should be used only if |
1678 | * you need some special @gup_flags. | 1678 | * you need some special @gup_flags. |
1679 | */ | 1679 | */ |
1680 | int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | 1680 | long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
1681 | unsigned long start, int nr_pages, unsigned int gup_flags, | 1681 | unsigned long start, unsigned long nr_pages, |
1682 | struct page **pages, struct vm_area_struct **vmas, | 1682 | unsigned int gup_flags, struct page **pages, |
1683 | int *nonblocking) | 1683 | struct vm_area_struct **vmas, int *nonblocking) |
1684 | { | 1684 | { |
1685 | int i; | 1685 | long i; |
1686 | unsigned long vm_flags; | 1686 | unsigned long vm_flags; |
1687 | 1687 | ||
1688 | if (nr_pages <= 0) | 1688 | if (!nr_pages) |
1689 | return 0; | 1689 | return 0; |
1690 | 1690 | ||
1691 | VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET)); | 1691 | VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET)); |
@@ -1981,9 +1981,9 @@ int fixup_user_fault(struct task_struct *tsk, struct mm_struct *mm, | |||
1981 | * | 1981 | * |
1982 | * See also get_user_pages_fast, for performance critical applications. | 1982 | * See also get_user_pages_fast, for performance critical applications. |
1983 | */ | 1983 | */ |
1984 | int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | 1984 | long get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
1985 | unsigned long start, int nr_pages, int write, int force, | 1985 | unsigned long start, unsigned long nr_pages, int write, |
1986 | struct page **pages, struct vm_area_struct **vmas) | 1986 | int force, struct page **pages, struct vm_area_struct **vmas) |
1987 | { | 1987 | { |
1988 | int flags = FOLL_TOUCH; | 1988 | int flags = FOLL_TOUCH; |
1989 | 1989 | ||