aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/cpu/perf_event.c3
-rw-r--r--kernel/perf_event.c2
-rw-r--r--kernel/trace/trace_event_perf.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 978d297170a1..0d3466cf7f57 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1695,6 +1695,7 @@ struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
1695 return entry; 1695 return entry;
1696} 1696}
1697 1697
1698#ifdef CONFIG_EVENT_TRACING
1698void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) 1699void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip)
1699{ 1700{
1700 regs->ip = ip; 1701 regs->ip = ip;
@@ -1706,4 +1707,4 @@ void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int ski
1706 regs->cs = __KERNEL_CS; 1707 regs->cs = __KERNEL_CS;
1707 local_save_flags(regs->flags); 1708 local_save_flags(regs->flags);
1708} 1709}
1709EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs); 1710#endif
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 8bf61273c58b..455393e71cab 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -2790,10 +2790,12 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs)
2790 return NULL; 2790 return NULL;
2791} 2791}
2792 2792
2793#ifdef CONFIG_EVENT_TRACING
2793__weak 2794__weak
2794void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) 2795void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip)
2795{ 2796{
2796} 2797}
2798#endif
2797 2799
2798/* 2800/*
2799 * Output 2801 * Output
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index 0709e4f75114..7d79a10c3cde 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -12,6 +12,8 @@
12DEFINE_PER_CPU(struct pt_regs, perf_trace_regs); 12DEFINE_PER_CPU(struct pt_regs, perf_trace_regs);
13EXPORT_PER_CPU_SYMBOL_GPL(perf_trace_regs); 13EXPORT_PER_CPU_SYMBOL_GPL(perf_trace_regs);
14 14
15EXPORT_SYMBOL_GPL(perf_arch_fetch_caller_regs);
16
15static char *perf_trace_buf; 17static char *perf_trace_buf;
16static char *perf_trace_buf_nmi; 18static char *perf_trace_buf_nmi;
17 19