diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-05 05:55:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-05 05:55:43 -0400 |
| commit | 931da6137e8e8c622f59251e8b645467aea293f1 (patch) | |
| tree | 2169cbd29d5d9a4cbc7104b2a744a95ba746c50d /arch/x86/mm | |
| parent | 5d67be97f8903d05ce53597fb5f3bc25a45e8026 (diff) | |
| parent | 1fd8df2c3970c9e7e4e262354154ee39e58bdd7c (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/kmemcheck/error.c b/arch/x86/mm/kmemcheck/error.c index 704a37ceddd..dab41876cdd 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, | |||
| 185 | e->trace.entries = e->trace_entries; | 185 | e->trace.entries = e->trace_entries; |
| 186 | e->trace.max_entries = ARRAY_SIZE(e->trace_entries); | 186 | e->trace.max_entries = ARRAY_SIZE(e->trace_entries); |
| 187 | e->trace.skip = 0; | 187 | e->trace.skip = 0; |
| 188 | save_stack_trace_regs(&e->trace, regs); | 188 | save_stack_trace_regs(regs, &e->trace); |
| 189 | 189 | ||
| 190 | /* Round address down to nearest 16 bytes */ | 190 | /* Round address down to nearest 16 bytes */ |
| 191 | shadow_copy = kmemcheck_shadow_lookup(address | 191 | shadow_copy = kmemcheck_shadow_lookup(address |