2020-12-09 06:35:09

by Zhen Lei

Subject: [PATCH 0/1] scsi: ufs-mediatek: use correct path to fix compiling error

This patch is based on the latest linux-next code. So the Fixes commit-id
maybe changed when it merged int v5.11-rc1.


Zhen Lei (1):
scsi: ufs-mediatek: use correct path to fix compiling error

drivers/scsi/ufs/ufs-mediatek-trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--
2.26.0.106.g9fadedd

2020-12-09 06:35:34

by Zhen Lei

Subject: [PATCH 1/1] scsi: ufs-mediatek: use correct path to fix compiling error

When the kernel is compiled with allmodconfig, the following error is
reported:
In file included from drivers/scsi/ufs/ufs-mediatek-trace.h:36:0,
from drivers/scsi/ufs/ufs-mediatek.c:28:
./include/trace/define_trace.h:95:42: fatal error: ./ufs-mediatek-trace.h: No such file or directory
#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)

The comment in include/trace/define_trace.h specifies that:
TRACE_INCLUDE_PATH: 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.

So without "CFLAGS_ufs-mediatek.o := -I$(src)", the current directory "."
is "include/trace/", the relative path of ufs-mediatek-trace.h is
"../../drivers/scsi/ufs/".

Fixes: ca1bb061d644 ("scsi: ufs-mediatek: Introduce event_notify implementation")
Signed-off-by: Zhen Lei <[email protected]>
---
drivers/scsi/ufs/ufs-mediatek-trace.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufs-mediatek-trace.h b/drivers/scsi/ufs/ufs-mediatek-trace.h
index fd6f84c1b4e2256..895e82ea6ece551 100644
--- a/drivers/scsi/ufs/ufs-mediatek-trace.h
+++ b/drivers/scsi/ufs/ufs-mediatek-trace.h
@@ -31,6 +31,6 @@ TRACE_EVENT(ufs_mtk_event,

#undef TRACE_INCLUDE_PATH
#undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_PATH ../../drivers/scsi/ufs/
#define TRACE_INCLUDE_FILE ufs-mediatek-trace
#include <trace/define_trace.h>
--
2.26.0.106.g9fadedd

2020-12-09 06:54:25

by Stanley Chu

Subject: Re: [PATCH 1/1] scsi: ufs-mediatek: use correct path to fix compiling error

Hi Zhen,

On Wed, 2020-12-09 at 14:31 +0800, Zhen Lei wrote:
> When the kernel is compiled with allmodconfig, the following error is
> reported:
> In file included from drivers/scsi/ufs/ufs-mediatek-trace.h:36:0,
> from drivers/scsi/ufs/ufs-mediatek.c:28:
> ./include/trace/define_trace.h:95:42: fatal error: ./ufs-mediatek-trace.h: No such file or directory
> #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
>
> The comment in include/trace/define_trace.h specifies that:
> TRACE_INCLUDE_PATH: 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.
>
> So without "CFLAGS_ufs-mediatek.o := -I$(src)", the current directory "."
> is "include/trace/", the relative path of ufs-mediatek-trace.h is
> "../../drivers/scsi/ufs/".
>
> Fixes: ca1bb061d644 ("scsi: ufs-mediatek: Introduce event_notify implementation")
> Signed-off-by: Zhen Lei <[email protected]>
> ---
> drivers/scsi/ufs/ufs-mediatek-trace.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/ufs/ufs-mediatek-trace.h b/drivers/scsi/ufs/ufs-mediatek-trace.h
> index fd6f84c1b4e2256..895e82ea6ece551 100644
> --- a/drivers/scsi/ufs/ufs-mediatek-trace.h
> +++ b/drivers/scsi/ufs/ufs-mediatek-trace.h
> @@ -31,6 +31,6 @@ TRACE_EVENT(ufs_mtk_event,
>
> #undef TRACE_INCLUDE_PATH
> #undef TRACE_INCLUDE_FILE
> -#define TRACE_INCLUDE_PATH .
> +#define TRACE_INCLUDE_PATH ../../drivers/scsi/ufs/
> #define TRACE_INCLUDE_FILE ufs-mediatek-trace
> #include <trace/define_trace.h>

Thanks for this fix.

Reviewed-by: Stanley Chu <[email protected]>

2020-12-09 17:05:05

by Martin K. Petersen

Subject: Re: [PATCH 1/1] scsi: ufs-mediatek: use correct path to fix compiling error

Zhen,

> So without "CFLAGS_ufs-mediatek.o := -I$(src)", the current directory "."
> is "include/trace/", the relative path of ufs-mediatek-trace.h is
> "../../drivers/scsi/ufs/".

Applied to 5.11/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering