diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-11-03 18:42:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-11-03 18:42:16 -0400 |
| commit | 23a12ddee1ce28065b71f14ccc695b5a0c8a64ff (patch) | |
| tree | cedaa1cde5b2557116e523c31552187804704093 /kernel/trace/trace_stack.c | |
| parent | 98f76206b33504b934209d16196477dfa519a807 (diff) | |
| parent | bcb6fb5da77c2a228adf07cc9cb1a0c2aa2001c6 (diff) | |
Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_stack.c')
| -rw-r--r-- | kernel/trace/trace_stack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c index 4237eba4ef20..2b0d1ee3241c 100644 --- a/kernel/trace/trace_stack.c +++ b/kernel/trace/trace_stack.c | |||
| @@ -111,7 +111,7 @@ check_stack(unsigned long ip, unsigned long *stack) | |||
| 111 | stack_trace_max_size = this_size; | 111 | stack_trace_max_size = this_size; |
| 112 | 112 | ||
| 113 | stack_trace_max.nr_entries = 0; | 113 | stack_trace_max.nr_entries = 0; |
| 114 | stack_trace_max.skip = 3; | 114 | stack_trace_max.skip = 0; |
| 115 | 115 | ||
| 116 | save_stack_trace(&stack_trace_max); | 116 | save_stack_trace(&stack_trace_max); |
| 117 | 117 | ||
