| Message ID | 20240529023322.3467755-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 57e3c5af2befaf54cbae326fe800c148852e67a1 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: fjes: correct TRACE_INCLUDE_PATH | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 28 May 2024 19:33:22 -0700 you wrote: > A comment in define_trace.h clearly states: > > TRACE_INCLUDE_PATH if the path is something other than core kernel > vvvvvvvvvvvvvv > include/trace then this macro can define the path to use. Note, the path > is relative to define_trace.h, not the file including it. Full path names > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > for out of tree modules must be used. > > [...] Here is the summary with links: - [net-next] net: fjes: correct TRACE_INCLUDE_PATH https://git.kernel.org/netdev/net-next/c/57e3c5af2bef You are awesome, thank you!
diff --git a/drivers/net/fjes/fjes_trace.h b/drivers/net/fjes/fjes_trace.h index 6437ddbd7842..2d3f0dddd375 100644 --- a/drivers/net/fjes/fjes_trace.h +++ b/drivers/net/fjes/fjes_trace.h @@ -358,7 +358,7 @@ TRACE_EVENT(fjes_stop_req_irq_post, #undef TRACE_INCLUDE_PATH #undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_PATH ../../../drivers/net/fjes +#define TRACE_INCLUDE_PATH ../../drivers/net/fjes #define TRACE_INCLUDE_FILE fjes_trace /* This part must be outside protection */
A comment in define_trace.h clearly states: TRACE_INCLUDE_PATH if the path is something other than core kernel vvvvvvvvvvvvvv include/trace then this macro can define the path to use. Note, the path is relative to define_trace.h, not the file including it. Full path names ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ for out of tree modules must be used. fjes uses path relative to itself. Which (somehow) works most of the time. Except when the kernel tree is "nested" in another kernel tree, and ../drivers/net/fjes actually exists. In which case build will use the header file from the wrong directory. I've been trying to figure out why net NIPA builder is constantly failing for the last 5 days, with: include/trace/../../../drivers/net/fjes/fjes_trace.h:88:17: error: ‘__assign_str’ undeclared (first use in this function) 88 | __assign_str(err, err); | ^~~~~~~~~~~~ when the line in the tree clearly has only one "err". NIPA does indeed have "nested" trees, because it uses git work-trees and the tree on the "outside" is not very up to date. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/fjes/fjes_trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)