diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memory.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index e347e106ca3a..d90ff9d04957 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -2352,10 +2352,8 @@ int make_pages_present(unsigned long addr, unsigned long end) | |||
| 2352 | if (!vma) | 2352 | if (!vma) |
| 2353 | return -1; | 2353 | return -1; |
| 2354 | write = (vma->vm_flags & VM_WRITE) != 0; | 2354 | write = (vma->vm_flags & VM_WRITE) != 0; |
| 2355 | if (addr >= end) | 2355 | BUG_ON(addr >= end); |
| 2356 | BUG(); | 2356 | BUG_ON(end > vma->vm_end); |
| 2357 | if (end > vma->vm_end) | ||
| 2358 | BUG(); | ||
| 2359 | len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE; | 2357 | len = (end+PAGE_SIZE-1)/PAGE_SIZE-addr/PAGE_SIZE; |
| 2360 | ret = get_user_pages(current, current->mm, addr, | 2358 | ret = get_user_pages(current, current->mm, addr, |
| 2361 | len, write, 0, NULL, NULL); | 2359 | len, write, 0, NULL, NULL); |