Merge tag 'drm-next-2019-12-06' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 1fc8a29..122938d 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -558,7 +558,7 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
        ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +
                                ((addr - vma->vm_start) >> PAGE_SHIFT),
                                map_flags);
-       if (offset_in_page(ret))
+       if (IS_ERR_VALUE(ret))
                goto out1;
 
        ret = move_vma(vma, addr, old_len, new_len, new_addr, locked, uf,
@@ -706,7 +706,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
                                        vma->vm_pgoff +
                                        ((addr - vma->vm_start) >> PAGE_SHIFT),
                                        map_flags);
-               if (offset_in_page(new_addr)) {
+               if (IS_ERR_VALUE(new_addr)) {
                        ret = new_addr;
                        goto out;
                }