diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 12:55:57 -0400 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /kernel/perf_event.c | |
| parent | 7be7923633a142402266d642ccebf74f556a649b (diff) | |
| parent | 018378c55b03f88ff513aba4e0e93b8d4a9cf241 (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 97c73018592e..c772a3d4000d 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -2946,11 +2946,6 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) | |||
| 2946 | return NULL; | 2946 | return NULL; |
| 2947 | } | 2947 | } |
| 2948 | 2948 | ||
| 2949 | __weak | ||
| 2950 | void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) | ||
| 2951 | { | ||
| 2952 | } | ||
| 2953 | |||
| 2954 | 2949 | ||
| 2955 | /* | 2950 | /* |
| 2956 | * We assume there is only KVM supporting the callbacks. | 2951 | * We assume there is only KVM supporting the callbacks. |