diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 15:14:17 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-17 15:14:17 +0200 |
| commit | 8434f0892ee85504a230a0e402c569774a8d0c42 (patch) | |
| tree | a8bc1734a06a1c57bd797220a99514e70ec72f93 /arch/powerpc/perf | |
| parent | powerpc/bpf: Use memset32() to pre-fill traps in BPF page(s) (diff) | |
| parent | powerpc/mm: Rename find_linux_pte_or_hugepte() (diff) | |
| download | linux-8434f0892ee85504a230a0e402c569774a8d0c42.tar.xz linux-8434f0892ee85504a230a0e402c569774a8d0c42.zip | |
Merge branch 'topic/ppc-kvm' into next
Bring in the commit to rename find_linux_pte_or_hugepte() which touches
arch and KVM code, and might need to be merged with the kvmppc tree to
avoid conflicts.
Diffstat (limited to 'arch/powerpc/perf')
| -rw-r--r-- | arch/powerpc/perf/callchain.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 0fc26714780a..0af051a1974e 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c @@ -22,6 +22,7 @@ #ifdef CONFIG_PPC64 #include "../kernel/ppc32.h" #endif +#include <asm/pte-walk.h> /* @@ -127,7 +128,7 @@ static int read_user_stack_slow(void __user *ptr, void *buf, int nb) return -EFAULT; local_irq_save(flags); - ptep = find_linux_pte_or_hugepte(pgdir, addr, NULL, &shift); + ptep = find_current_mm_pte(pgdir, addr, NULL, &shift); if (!ptep) goto err_out; if (!shift) |