Merge branch 'tip/perf/urgent'

[linux-2.6-microblaze.git] / kernel / events / uprobes.c

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 3048589..435aac1 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -474,8 +474,8 @@ retry:
                gup_flags |= FOLL_SPLIT_PMD;
        /* Read the page with vaddr into memory */
        old_page = get_user_page_vma_remote(mm, vaddr, gup_flags, &vma);
-       if (IS_ERR_OR_NULL(old_page))
-               return old_page ? PTR_ERR(old_page) : 0;
+       if (IS_ERR(old_page))
+               return PTR_ERR(old_page);
 
        ret = verify_opcode(old_page, vaddr, &opcode);
        if (ret <= 0)