diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-03 12:17:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-03 12:17:55 -0400 |
| commit | 22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d (patch) | |
| tree | 9981477f6f9e4527a9598e636d0ffc7705a322a4 /kernel | |
| parent | 70a7c1271e2bfca8ad2bf71f44c516ea2763b9ed (diff) | |
| parent | 6e03bb5ad363fdbe4e1e227cfb78f7978c662e18 (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 074ba2e036c8..63fbce1c80b5 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -2788,12 +2788,11 @@ __weak struct perf_callchain_entry *perf_callchain(struct pt_regs *regs) | |||
| 2788 | return NULL; | 2788 | return NULL; |
| 2789 | } | 2789 | } |
| 2790 | 2790 | ||
| 2791 | #ifdef CONFIG_EVENT_TRACING | ||
| 2792 | __weak | 2791 | __weak |
| 2793 | void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) | 2792 | void perf_arch_fetch_caller_regs(struct pt_regs *regs, unsigned long ip, int skip) |
| 2794 | { | 2793 | { |
| 2795 | } | 2794 | } |
| 2796 | #endif | 2795 | |
| 2797 | 2796 | ||
| 2798 | /* | 2797 | /* |
| 2799 | * Output | 2798 | * Output |