aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-20 08:06:48 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-20 08:06:48 -1000
commitfd58b517e593ed4f54d8c8b47613928c2066c046 (patch)
tree16ca5856a2ae65a6885260b74f248aee454fabf7
parentc0691143dfe1d42ec9bd89de5921ccb6a27ea1b3 (diff)
parentabc41254181e901ef5eda2c884ca6cd88a186b6d (diff)
downloadlinux-linaro-stable-fd58b517e593ed4f54d8c8b47613928c2066c046.tar.gz
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 perf fix from Catalin Marinas: "Perf fix (user-mode PC recording)" * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: perf: arm64: Record the user-mode PC in the call chain.
-rw-r--r--arch/arm64/kernel/perf_event.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 1e49e5eb81e9..9ba33c40cdf8 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -1336,6 +1336,7 @@ void perf_callchain_user(struct perf_callchain_entry *entry,
return;
}
+ perf_callchain_store(entry, regs->pc);
tail = (struct frame_tail __user *)regs->regs[29];
while (entry->nr < PERF_MAX_STACK_DEPTH &&