summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorIngo Molnar2011-07-05 11:55:43 +0200
committerIngo Molnar2011-07-05 11:55:43 +0200
commit931da6137e8e8c622f59251e8b645467aea293f1 (patch)
tree2169cbd29d5d9a4cbc7104b2a744a95ba746c50d /arch/x86/mm
parentperf report/annotate/script: Add option to specify a CPU range (diff)
parenttracing/kprobes: Fix kprobe-tracer to support stack trace (diff)
downloadkernel-qcow2-linux-931da6137e8e8c622f59251e8b645467aea293f1.tar.gz
kernel-qcow2-linux-931da6137e8e8c622f59251e8b645467aea293f1.tar.xz
kernel-qcow2-linux-931da6137e8e8c622f59251e8b645467aea293f1.zip
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/kmemcheck/error.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/kmemcheck/error.c b/arch/x86/mm/kmemcheck/error.c
index 704a37cedddb..dab41876cdd5 100644
--- a/arch/x86/mm/kmemcheck/error.c
+++ b/arch/x86/mm/kmemcheck/error.c
@@ -185,7 +185,7 @@ void kmemcheck_error_save(enum kmemcheck_shadow state,
e->trace.entries = e->trace_entries;
e->trace.max_entries = ARRAY_SIZE(e->trace_entries);
e->trace.skip = 0;
- save_stack_trace_regs(&e->trace, regs);
+ save_stack_trace_regs(regs, &e->trace);
/* Round address down to nearest 16 bytes */
shadow_copy = kmemcheck_shadow_lookup(address