sparc64: Fix perf_arch_get_caller_regs().

After b0f82b81fe6bbcf78d478071f33e44554726bc81 ("perf: Drop the skip
argument from perf_arch_fetch_regs_caller") the build broke on sparc64
due to the lack of a module symbol export of __perf_arch_fetch_caller_regs.

But that assembler helper can actually be complete eliminated now that
the semantics of this interface have been greatly simplified.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 5 deletions

diff --git a/arch/sparc/include/asm/perf_event.h b/arch/sparc/include/asm/perf_event.h
index 74c4e0cd889c..727af70646cb 100644
--- a/arch/sparc/include/asm/perf_event.h
+++ b/arch/sparc/include/asm/perf_event.h
@@ -10,11 +10,26 @@ extern void set_perf_event_pending(void);
 
 extern void init_hw_perf_events(void);
 
-extern void
-__perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip);
-
-#define perf_arch_fetch_caller_regs(pt_regs, ip)        \
-        __perf_arch_fetch_caller_regs(pt_regs, ip, 1);
+#define perf_arch_fetch_caller_regs(regs, ip)           \
+do {                                                    \
+        unsigned long _pstate, _asi, _pil, _i7, _fp;    \
+        __asm__ __volatile__("rdpr %%pstate, %0\n\t"    \
+                             "rd %%asi, %1\n\t"         \
+                             "rdpr %%pil, %2\n\t"       \
+                             "mov %%i7, %3\n\t"         \
+                             "mov %%i6, %4\n\t"         \
+                             : "=r" (_pstate),          \
+                               "=r" (_asi),             \
+                               "=r" (_pil),             \
+                               "=r" (_i7),              \
+                               "=r" (_fp));             \
+        (regs)->tstate = (_pstate << 8) |               \
+                (_asi << 24) | (_pil << 20);            \
+        (regs)->tpc = (ip);                             \
+        (regs)->tnpc = (regs)->tpc + 4;                 \
+        (regs)->u_regs[UREG_I6] = _fp;                  \
+        (regs)->u_regs[UREG_I7] = _i7;                  \
+} while (0)
 #else
 static inline void init_hw_perf_events(void)    { }
 #endif