summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:56:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:56:24 -0800
commit952363c90c93e967c8e1819131b68cbb6f9c962f (patch)
treed68303e8615d56cff385ee1331ab536994e8096f /arch/x86
parent2d959e95658a0224b0dd0d787926d5ffc95f9574 (diff)
parent05cbaa2853cdfc255fdd04e65a82bfe9208c4e52 (diff)
downloadop-kernel-dev-952363c90c93e967c8e1819131b68cbb6f9c962f.zip
op-kernel-dev-952363c90c93e967c8e1819131b68cbb6f9c962f.tar.gz
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix NULL deref in inheritance code perf: Pass appropriate frame pointer to dump_trace()
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_event.c2
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 c223b7e..d616c06 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -2347,7 +2347,7 @@ perf_callchain_kernel(struct pt_regs *regs, struct perf_callchain_entry *entry)
callchain_store(entry, PERF_CONTEXT_KERNEL);
callchain_store(entry, regs->ip);
- dump_trace(NULL, regs, NULL, 0, &backtrace_ops, entry);
+ dump_trace(NULL, regs, NULL, regs->bp, &backtrace_ops, entry);
}
/*
OpenPOWER on IntegriCloud