diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-05 11:55:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-05 11:55:43 +0200 |
| commit | 931da6137e8e8c622f59251e8b645467aea293f1 (patch) | |
| tree | 2169cbd29d5d9a4cbc7104b2a744a95ba746c50d /arch | |
| parent | 5d67be97f8903d05ce53597fb5f3bc25a45e8026 (diff) | |
| parent | 1fd8df2c3970c9e7e4e262354154ee39e58bdd7c (diff) | |
| download | linux-next-931da6137e8e8c622f59251e8b645467aea293f1.tar.gz | |
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')
| -rw-r--r-- | arch/x86/kernel/stacktrace.c | 2 | ||||
| -rw-r--r-- | arch/x86/mm/kmemcheck/error.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c index 55d9bc03f696..fdd0c6430e5a 100644 --- a/arch/x86/kernel/stacktrace.c +++ b/arch/x86/kernel/stacktrace.c @@ -66,7 +66,7 @@ void save_stack_trace(struct stack_trace *trace) } EXPORT_SYMBOL_GPL(save_stack_trace); -void save_stack_trace_regs(struct stack_trace *trace, struct pt_regs *regs) +void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace) { dump_trace(current, regs, NULL, 0, &save_stack_ops, trace); if (trace->nr_entries < trace->max_entries) 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 |