diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-30 08:10:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-30 08:10:51 +0100 |
| commit | 28336be568bb473d16ba80db0801276fb4f1bbe5 (patch) | |
| tree | cf2d7a56e6c3ea08139d8d9a5a58b296bd172136 /kernel/stacktrace.c | |
| parent | 5cbaefe9743bf14c9d3106db0cc19f8cb0a3ca22 (diff) | |
| parent | fd6988496e79a6a4bdb514a4655d2920209eb85d (diff) | |
Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts
Conflicts:
init/main.c
lib/Kconfig.debug
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/stacktrace.c')
| -rw-r--r-- | kernel/stacktrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index c9ea7eb2cb1a..2af66e449aa6 100644 --- a/kernel/stacktrace.c +++ b/kernel/stacktrace.c @@ -142,7 +142,7 @@ unsigned int stack_trace_save_tsk(struct task_struct *tsk, unsigned long *store, .store = store, .size = size, /* skip this function if they are tracing us */ - .skip = skipnr + !!(current == tsk), + .skip = skipnr + (current == tsk), }; if (!try_get_task_stack(tsk)) @@ -300,7 +300,7 @@ unsigned int stack_trace_save_tsk(struct task_struct *task, .entries = store, .max_entries = size, /* skip this function if they are tracing us */ - .skip = skipnr + !!(current == task), + .skip = skipnr + (current == task), }; save_stack_trace_tsk(task, &trace); |