diff options
| author |   Leon Romanovsky <leon@kernel.org> | 2025-02-25 04:04:46 -0500 |
|---|---|---|
| committer | Leon Romanovsky <leon@kernel.org> | 2025-02-25 04:04:46 -0500 |
| commit | 230804a89319a76c6e653caadc98a870877548cc (patch) | |
| tree | 27113d25cebb6a5c868e7c35a29809921223f86f /kernel/trace/trace_functions_graph.c | |
| parent | RDMA/hfi1: Remove unused one_qsfp_write (diff) | |
| parent | net/mlx5: Change POOL_NEXT_SIZE define value and make it global (diff) | |
| download | wireguard-linux-230804a89319a76c6e653caadc98a870877548cc.tar.xz wireguard-linux-230804a89319a76c6e653caadc98a870877548cc.zip | |
Merge branch 'mlx5-next' into wip/leon-for-next
This is merge of shared branch between RDMA and net-next trees.
* mlx5-next: (550 commits)
net/mlx5: Change POOL_NEXT_SIZE define value and make it global
net/mlx5: Add new health syndrome error and crr bit offset
Linux 6.14-rc3
...
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 54d850997c0a..136c750b0b4d 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -198,7 +198,7 @@ int trace_graph_entry(struct ftrace_graph_ent *trace, * returning from the function. */ if (ftrace_graph_notrace_addr(trace->func)) { - *task_var |= TRACE_GRAPH_NOTRACE_BIT; + *task_var |= TRACE_GRAPH_NOTRACE; /* * Need to return 1 to have the return called * that will clear the NOTRACE bit. |