diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-11-11 07:59:06 +0100 |
commit | 1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38 (patch) | |
tree | 548d3518b41341b93c88ee4ff5661e1eb42bd7f4 /kernel/stacktrace.c | |
parent | perf/core: Optimize perf_init_event() for TYPE_SOFTWARE (diff) | |
parent | Linux 5.4-rc7 (diff) | |
download | linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.tar.xz linux-dev-1ca7feb59087a3d1a4ef79e09c42eca5c2e7fa38.zip |
Merge tag 'v5.4-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/stacktrace.c')
-rw-r--r-- | kernel/stacktrace.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c index 6d1f68b7e528..c9ea7eb2cb1a 100644 --- a/kernel/stacktrace.c +++ b/kernel/stacktrace.c @@ -141,7 +141,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *tsk, unsigned long *store, struct stacktrace_cookie c = { .store = store, .size = size, - .skip = skipnr + 1, + /* skip this function if they are tracing us */ + .skip = skipnr + !!(current == tsk), }; if (!try_get_task_stack(tsk)) @@ -298,7 +299,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *task, struct stack_trace trace = { .entries = store, .max_entries = size, - .skip = skipnr + 1, + /* skip this function if they are tracing us */ + .skip = skipnr + !!(current == task), }; save_stack_trace_tsk(task, &trace); |