summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/perf_event.h
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2012-06-26 05:01:36 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-10 13:18:41 +0400
commit75382aa72f06823db7312ad069c3bae2eb3f8548 (patch)
treed345dbb162b14375d20a622a0801fd9a93cf1c1c /arch/powerpc/include/asm/perf_event.h
parent68b30bb9f0fed8281fe8a1ac818d6d07c803fa7b (diff)
downloadlinux-75382aa72f06823db7312ad069c3bae2eb3f8548.tar.xz
powerpc/perf: Move code to select SIAR or pt_regs into perf_read_regs
The logic to choose whether to use the SIAR or get the information out of pt_regs is going to get more complicated, so do it once in perf_read_regs. We overload regs->result which is gross but we are already doing it with regs->dsisr. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/perf_event.h')
-rw-r--r--arch/powerpc/include/asm/perf_event.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h
index 5c16b891d501..0bb23725b1e7 100644
--- a/arch/powerpc/include/asm/perf_event.h
+++ b/arch/powerpc/include/asm/perf_event.h
@@ -26,8 +26,13 @@
#include <asm/ptrace.h>
#include <asm/reg.h>
+/*
+ * Overload regs->result to specify whether we should use the MSR (result
+ * is zero) or the SIAR (result is non zero).
+ */
#define perf_arch_fetch_caller_regs(regs, __ip) \
do { \
+ (regs)->result = 0; \
(regs)->nip = __ip; \
(regs)->gpr[1] = *(unsigned long *)__get_SP(); \
asm volatile("mfmsr %0" : "=r" ((regs)->msr)); \