Pull tracing fixes from Steven Rostedt: "Two minor fixes: - Fix trace event header include guards, as several did not match the #define to the #ifdef - Remove a redundant test to ftrace_graph_notrace_addr() that was accidentally added" * tag 'trace-v5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: fgraph: Remove redundant ftrace_graph_notrace_addr() test tracing: Fix header include guards in trace event headers
Showing the changes to kernel (1 of 5 files). Show all
Unified · Split
| @@ -137,6 +137,13 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) · 136 unmodified lines | |||
| 137 | if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT)) | 137 | if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT)) |
| 138 | return 0; | 138 | return 0; |
| 139 | 139 | ||
| 140 | /* | ||
| 141 | * Do not trace a function if it's filtered by set_graph_notrace. | ||
| 142 | * Make the index of ret stack negative to indicate that it should | ||
| 143 | * ignore further functions. But it needs its own ret stack entry | ||
| 144 | * to recover the original index in order to continue tracing after | ||
| 145 | * returning from the function. | ||
| 146 | */ | ||
| 140 | if (ftrace_graph_notrace_addr(trace->func)) { | 147 | if (ftrace_graph_notrace_addr(trace->func)) { |
| 141 | trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT); | 148 | trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT); |
| 142 | /* | 149 | /* |
| @@ -155,16 +162,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace) · 12 unmodified lines | |||
| 155 | if (ftrace_graph_ignore_irqs()) | 162 | if (ftrace_graph_ignore_irqs()) |
| 156 | return 0; | 163 | return 0; |
| 157 | 164 | ||
| 158 | /* | ||
| 159 | * Do not trace a function if it's filtered by set_graph_notrace. | ||
| 160 | * Make the index of ret stack negative to indicate that it should | ||
| 161 | * ignore further functions. But it needs its own ret stack entry | ||
| 162 | * to recover the original index in order to continue tracing after | ||
| 163 | * returning from the function. | ||
| 164 | */ | ||
| 165 | if (ftrace_graph_notrace_addr(trace->func)) | ||
| 166 | return 1; | ||
| 167 | |||
| 168 | /* | 165 | /* |
| 169 | * Stop here if tracing_threshold is set. We only write function return | 166 | * Stop here if tracing_threshold is set. We only write function return |
| 170 | * events to the ring buffer. | 167 | * events to the ring buffer. |