diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-03 10:02:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-03 10:02:00 -0800 |
| commit | dbc15d24f9fa6f25723ef750b65b98bfcd3d3910 (patch) | |
| tree | 898b0bdeeaf84b5abff030caecbb74be0b4fef3e /init/init_task.c | |
| parent | 54fe3ffef0ebb60b1273d0d7b047ee9b4723cc61 (diff) | |
| parent | c8b186a8d54d7e12d28e9f9686cb00ff18fc2ab2 (diff) | |
| download | linux-dbc15d24f9fa6f25723ef750b65b98bfcd3d3910.tar.gz linux-dbc15d24f9fa6f25723ef750b65b98bfcd3d3910.tar.bz2 linux-dbc15d24f9fa6f25723ef750b65b98bfcd3d3910.zip | |
Merge tag 'trace-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
- Initialize tracing-graph-pause at task creation, not start of
function tracing, to avoid corrupting the pause counter.
- Set "pause-on-trace" for latency tracers as that option breaks their
output (regression).
- Fix the wrong error return for setting kretprobes on future modules
(before they are loaded).
- Fix re-registering the same kretprobe.
- Add missing value check for added RCU variable reload.
* tag 'trace-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracepoint: Fix race between tracing and removing tracepoint
kretprobe: Avoid re-registration of the same kretprobe earlier
tracing/kprobe: Fix to support kretprobe events on unloaded modules
tracing: Use pause-on-trace with the latency tracers
fgraph: Initialize tracing_graph_pause at task creation
Diffstat (limited to 'init/init_task.c')
| -rw-r--r-- | init/init_task.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/init_task.c b/init/init_task.c index 8a992d73e6fb..3711cdaafed2 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -198,7 +198,8 @@ struct task_struct init_task .lockdep_recursion = 0, #endif #ifdef CONFIG_FUNCTION_GRAPH_TRACER - .ret_stack = NULL, + .ret_stack = NULL, + .tracing_graph_pause = ATOMIC_INIT(0), #endif #if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPTION) .trace_recursion = 0, |