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
Unified · Split
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | #undef TRACE_SYSTEM | 2 | #undef TRACE_SYSTEM |
| 3 | #define TRACE_SYSTEM dma_fence | 3 | #define TRACE_SYSTEM dma_fence |
| 4 | 4 | ||
| 5 | #if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ) | 5 | #if !defined(_TRACE_DMA_FENCE_H) || defined(TRACE_HEADER_MULTI_READ) |
| 6 | #define _TRACE_DMA_FENCE_H | 6 | #define _TRACE_DMA_FENCE_H |
| 7 | 7 | ||
| 8 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | |||
| 3 | #define TRACE_SYSTEM napi | 3 | #define TRACE_SYSTEM napi |
| 4 | 4 | ||
| 5 | #if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ) | 5 | #if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ) |
| 6 | #define _TRACE_NAPI_H_ | 6 | #define _TRACE_NAPI_H |
| 7 | 7 | ||
| 8 | #include <linux/netdevice.h> | 8 | #include <linux/netdevice.h> |
| 9 | #include <linux/tracepoint.h> | 9 | #include <linux/tracepoint.h> |
| @@ -38,7 +38,7 @@ TRACE_EVENT(napi_poll, · 28 unmodified lines | |||
| 38 | 38 | ||
| 39 | #undef NO_DEV | 39 | #undef NO_DEV |
| 40 | 40 | ||
| 41 | #endif /* _TRACE_NAPI_H_ */ | 41 | #endif /* _TRACE_NAPI_H */ |
| 42 | 42 | ||
| 43 | /* This part must be outside protection */ | 43 | /* This part must be outside protection */ |
| 44 | #include <trace/define_trace.h> | 44 | #include <trace/define_trace.h> |
| @@ -2,7 +2,7 @@ · 1 unmodified line | |||
| 2 | #define TRACE_SYSTEM qdisc | 2 | #define TRACE_SYSTEM qdisc |
| 3 | 3 | ||
| 4 | #if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ) | 4 | #if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ) |
| 5 | #define _TRACE_QDISC_H_ | 5 | #define _TRACE_QDISC_H |
| 6 | 6 | ||
| 7 | #include <linux/skbuff.h> | 7 | #include <linux/skbuff.h> |
| 8 | #include <linux/netdevice.h> | 8 | #include <linux/netdevice.h> |
| @@ -44,7 +44,7 @@ TRACE_EVENT(qdisc_dequeue, · 35 unmodified lines | |||
| 44 | __entry->txq_state, __entry->packets, __entry->skbaddr ) | 44 | __entry->txq_state, __entry->packets, __entry->skbaddr ) |
| 45 | ); | 45 | ); |
| 46 | 46 | ||
| 47 | #endif /* _TRACE_QDISC_H_ */ | 47 | #endif /* _TRACE_QDISC_H */ |
| 48 | 48 | ||
| 49 | /* This part must be outside protection */ | 49 | /* This part must be outside protection */ |
| 50 | #include <trace/define_trace.h> | 50 | #include <trace/define_trace.h> |
| @@ -1,5 +1,5 @@ | |||
| 1 | #if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ) | 1 | #if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ) |
| 2 | #define _TRACE_TEGRA_APM_DMA_H | 2 | #define _TRACE_TEGRA_APB_DMA_H |
| 3 | 3 | ||
| 4 | #include <linux/tracepoint.h> | 4 | #include <linux/tracepoint.h> |
| 5 | #include <linux/dmaengine.h> | 5 | #include <linux/dmaengine.h> |
| @@ -55,7 +55,7 @@ TRACE_EVENT(tegra_dma_isr, · 49 unmodified lines | |||
| 55 | TP_printk("%s: irq %d\n", __get_str(chan), __entry->irq) | 55 | TP_printk("%s: irq %d\n", __get_str(chan), __entry->irq) |
| 56 | ); | 56 | ); |
| 57 | 57 | ||
| 58 | #endif /* _TRACE_TEGRADMA_H */ | 58 | #endif /* _TRACE_TEGRA_APB_DMA_H */ |
| 59 | 59 | ||
| 60 | /* This part must be outside protection */ | 60 | /* This part must be outside protection */ |
| 61 | #include <trace/define_trace.h> | 61 | #include <trace/define_trace.h> |
| @@ -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. |