diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-18 14:07:12 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-18 14:07:12 -0500 |
| commit | ae51ce9061b1ddc0fde363913c932bee5b9bc5fd (patch) | |
| tree | 40fd3d633714d2a53fdbd2bdd172fb61232d999a /arch/x86/oprofile | |
| parent | 072b198a4ad48bd722ec6d203d65422a4698eae7 (diff) | |
| parent | 423478cde453eebdfcfebf4b8d378d8f5d49b853 (diff) | |
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/oprofile')
| -rw-r--r-- | arch/x86/oprofile/backtrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c index 2d49d4e19a36..72cbec14d783 100644 --- a/arch/x86/oprofile/backtrace.c +++ b/arch/x86/oprofile/backtrace.c | |||
| @@ -126,7 +126,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth) | |||
| 126 | if (!user_mode_vm(regs)) { | 126 | if (!user_mode_vm(regs)) { |
| 127 | unsigned long stack = kernel_stack_pointer(regs); | 127 | unsigned long stack = kernel_stack_pointer(regs); |
| 128 | if (depth) | 128 | if (depth) |
| 129 | dump_trace(NULL, regs, (unsigned long *)stack, 0, | 129 | dump_trace(NULL, regs, (unsigned long *)stack, |
| 130 | &backtrace_ops, &depth); | 130 | &backtrace_ops, &depth); |
| 131 | return; | 131 | return; |
| 132 | } | 132 | } |