Merge tag 'powerpc-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / arch / powerpc / perf / callchain.c

diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c
index 22d9015..26d37e6 100644 (file)
--- a/arch/powerpc/perf/callchain.c
+++ b/arch/powerpc/perf/callchain.c
@@ -137,7 +137,7 @@ static int read_user_stack_slow(void __user *ptr, void *buf, int nb)
        offset = addr & ((1UL << shift) - 1);
 
        pte = READ_ONCE(*ptep);
-       if (!pte_present(pte) || !(pte_val(pte) & _PAGE_USER))
+       if (!pte_present(pte) || !pte_user(pte))
                goto err_out;
        pfn = pte_pfn(pte);
        if (!page_is_ram(pfn))