diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 20:07:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 20:07:12 +0100 |
| commit | ae51ce9061b1ddc0fde363913c932bee5b9bc5fd (patch) | |
| tree | 40fd3d633714d2a53fdbd2bdd172fb61232d999a /arch/x86/kernel/cpu/perf_event.c | |
| parent | 072b198a4ad48bd722ec6d203d65422a4698eae7 (diff) | |
| parent | 423478cde453eebdfcfebf4b8d378d8f5d49b853 (diff) | |
| download | lwn-ae51ce9061b1ddc0fde363913c932bee5b9bc5fd.tar.gz lwn-ae51ce9061b1ddc0fde363913c932bee5b9bc5fd.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 1f129a14e3a2..5273c7b90b8b 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1657,7 +1657,7 @@ perf_callchain_kernel(struct perf_callchain_entry *entry, struct pt_regs *regs) perf_callchain_store(entry, regs->ip); - dump_trace(NULL, regs, NULL, regs->bp, &backtrace_ops, entry); + dump_trace(NULL, regs, NULL, &backtrace_ops, entry); } #ifdef CONFIG_COMPAT |