diff options
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 2fd2ad5da98e..bf0cc762a7d2 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
| @@ -173,8 +173,8 @@ unsigned int kobjsize(const void *objp) | |||
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | 175 | int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
| 176 | unsigned long start, int len, int flags, | 176 | unsigned long start, int nr_pages, int flags, |
| 177 | struct page **pages, struct vm_area_struct **vmas) | 177 | struct page **pages, struct vm_area_struct **vmas) |
| 178 | { | 178 | { |
| 179 | struct vm_area_struct *vma; | 179 | struct vm_area_struct *vma; |
| 180 | unsigned long vm_flags; | 180 | unsigned long vm_flags; |
| @@ -189,7 +189,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 189 | vm_flags = write ? (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD); | 189 | vm_flags = write ? (VM_WRITE | VM_MAYWRITE) : (VM_READ | VM_MAYREAD); |
| 190 | vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); | 190 | vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); |
| 191 | 191 | ||
| 192 | for (i = 0; i < len; i++) { | 192 | for (i = 0; i < nr_pages; i++) { |
| 193 | vma = find_vma(mm, start); | 193 | vma = find_vma(mm, start); |
| 194 | if (!vma) | 194 | if (!vma) |
| 195 | goto finish_or_fault; | 195 | goto finish_or_fault; |
| @@ -224,7 +224,7 @@ finish_or_fault: | |||
| 224 | * - don't permit access to VMAs that don't support it, such as I/O mappings | 224 | * - don't permit access to VMAs that don't support it, such as I/O mappings |
| 225 | */ | 225 | */ |
| 226 | int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | 226 | int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, |
| 227 | unsigned long start, int len, int write, int force, | 227 | unsigned long start, int nr_pages, int write, int force, |
| 228 | struct page **pages, struct vm_area_struct **vmas) | 228 | struct page **pages, struct vm_area_struct **vmas) |
| 229 | { | 229 | { |
| 230 | int flags = 0; | 230 | int flags = 0; |
| @@ -234,9 +234,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
| 234 | if (force) | 234 | if (force) |
| 235 | flags |= GUP_FLAGS_FORCE; | 235 | flags |= GUP_FLAGS_FORCE; |
| 236 | 236 | ||
| 237 | return __get_user_pages(tsk, mm, | 237 | return __get_user_pages(tsk, mm, start, nr_pages, flags, pages, vmas); |
| 238 | start, len, flags, | ||
| 239 | pages, vmas); | ||
| 240 | } | 238 | } |
| 241 | EXPORT_SYMBOL(get_user_pages); | 239 | EXPORT_SYMBOL(get_user_pages); |
| 242 | 240 | ||
