summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJed Davis <jld@mozilla.com>2013-06-20 10:16:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-21 18:19:02 -0700
commita62fe336474b61aa946e6a6e327890234a33a01b (patch)
treea49f9c570b08b6a6dd4fc93c3f674b4bba56de16
parent6e514ac663f8d9ad5d533d9beb163b9d3142632f (diff)
downloadlinux-3.10-a62fe336474b61aa946e6a6e327890234a33a01b.tar.gz
linux-3.10-a62fe336474b61aa946e6a6e327890234a33a01b.tar.bz2
linux-3.10-a62fe336474b61aa946e6a6e327890234a33a01b.zip
ARM: 7765/1: perf: Record the user-mode PC in the call chain.
commit c5f927a6f62196226915f12194c9d0df4e2210d7 upstream. With this change, we no longer lose the innermost entry in the user-mode part of the call chain. See also the x86 port, which includes the ip. It's possible to partially work around this problem by post-processing the data to use the PERF_SAMPLE_IP value, but this works only if the CPU wasn't in the kernel when the sample was taken. Signed-off-by: Jed Davis <jld@mozilla.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/kernel/perf_event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 85d63329769..a99ed7a09d9 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -824,6 +824,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
struct frame_tail __user *tail;
+ perf_callchain_store(entry, regs->ARM_pc);
tail = (struct frame_tail __user *)regs->ARM_fp - 1;
while ((entry->nr < PERF_MAX_STACK_DEPTH) &&