diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-09 18:55:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 18:55:57 +0200 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /arch/sparc | |
| parent | 7be7923633a142402266d642ccebf74f556a649b (diff) | |
| parent | 018378c55b03f88ff513aba4e0e93b8d4a9cf241 (diff) | |
| download | linux-c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8.tar.gz | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/perf_event.h | 8 | ||||
| -rw-r--r-- | arch/sparc/kernel/helpers.S | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/perf_event.h b/arch/sparc/include/asm/perf_event.h index 7e2669894ce8..74c4e0cd889c 100644 --- a/arch/sparc/include/asm/perf_event.h +++ b/arch/sparc/include/asm/perf_event.h @@ -6,7 +6,15 @@ extern void set_perf_event_pending(void); #define PERF_EVENT_INDEX_OFFSET 0 #ifdef CONFIG_PERF_EVENTS +#include <asm/ptrace.h> + 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); #else static inline void init_hw_perf_events(void) { } #endif diff --git a/arch/sparc/kernel/helpers.S b/arch/sparc/kernel/helpers.S index 92090cc9e829..682fee06a16b 100644 --- a/arch/sparc/kernel/helpers.S +++ b/arch/sparc/kernel/helpers.S @@ -47,9 +47,9 @@ stack_trace_flush: .size stack_trace_flush,.-stack_trace_flush #ifdef CONFIG_PERF_EVENTS - .globl perf_arch_fetch_caller_regs - .type perf_arch_fetch_caller_regs,#function -perf_arch_fetch_caller_regs: + .globl __perf_arch_fetch_caller_regs + .type __perf_arch_fetch_caller_regs,#function +__perf_arch_fetch_caller_regs: /* We always read the %pstate into %o5 since we will use * that to construct a fake %tstate to store into the regs. */ |