| Message ID | 1548401030-28860-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | b7fce8f79d947abbe84e577d89ded3c3d5345c23 |
| Headers | show |
| Series | lightnvm: pblk: fix TRACE_INCLUDE_PATH | expand |
On Fri, Jan 25, 2019 at 8:35 AM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > As the comment block in include/trace/define_trace.h says, > TRACE_INCLUDE_PATH should be a relative path to the define_trace.h > > ../../drivers/lightnvm is the correct relative path. > > ../../../drivers/lightnvm is working by coincidence because the top > Makefile adds -I$(srctree)/arch/$(SRCARCH)/include as a header > search path, but we should not rely on it. Nice catch, thanks! Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com> > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > drivers/lightnvm/pblk-trace.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/lightnvm/pblk-trace.h b/drivers/lightnvm/pblk-trace.h > index 679e5c45..9534503 100644 > --- a/drivers/lightnvm/pblk-trace.h > +++ b/drivers/lightnvm/pblk-trace.h > @@ -139,7 +139,7 @@ TRACE_EVENT(pblk_state, > /* This part must be outside protection */ > > #undef TRACE_INCLUDE_PATH > -#define TRACE_INCLUDE_PATH ../../../drivers/lightnvm > +#define TRACE_INCLUDE_PATH ../../drivers/lightnvm > #undef TRACE_INCLUDE_FILE > #define TRACE_INCLUDE_FILE pblk-trace > #include <trace/define_trace.h> > -- > 2.7.4 >
On 1/25/19 9:01 AM, Hans Holmberg wrote: > On Fri, Jan 25, 2019 at 8:35 AM Masahiro Yamada > <yamada.masahiro@socionext.com> wrote: >> >> As the comment block in include/trace/define_trace.h says, >> TRACE_INCLUDE_PATH should be a relative path to the define_trace.h >> >> ../../drivers/lightnvm is the correct relative path. >> >> ../../../drivers/lightnvm is working by coincidence because the top >> Makefile adds -I$(srctree)/arch/$(SRCARCH)/include as a header >> search path, but we should not rely on it. > > Nice catch, thanks! > > Reviewed-by: Hans Holmberg <hans.holmberg@cnexlabs.com> > >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> --- >> >> drivers/lightnvm/pblk-trace.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/lightnvm/pblk-trace.h b/drivers/lightnvm/pblk-trace.h >> index 679e5c45..9534503 100644 >> --- a/drivers/lightnvm/pblk-trace.h >> +++ b/drivers/lightnvm/pblk-trace.h >> @@ -139,7 +139,7 @@ TRACE_EVENT(pblk_state, >> /* This part must be outside protection */ >> >> #undef TRACE_INCLUDE_PATH >> -#define TRACE_INCLUDE_PATH ../../../drivers/lightnvm >> +#define TRACE_INCLUDE_PATH ../../drivers/lightnvm >> #undef TRACE_INCLUDE_FILE >> #define TRACE_INCLUDE_FILE pblk-trace >> #include <trace/define_trace.h> >> -- >> 2.7.4 >> Thanks Masahiro-san. Applied for 5.1.
diff --git a/drivers/lightnvm/pblk-trace.h b/drivers/lightnvm/pblk-trace.h index 679e5c45..9534503 100644 --- a/drivers/lightnvm/pblk-trace.h +++ b/drivers/lightnvm/pblk-trace.h @@ -139,7 +139,7 @@ TRACE_EVENT(pblk_state, /* This part must be outside protection */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../../drivers/lightnvm +#define TRACE_INCLUDE_PATH ../../drivers/lightnvm #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE pblk-trace #include <trace/define_trace.h>
As the comment block in include/trace/define_trace.h says, TRACE_INCLUDE_PATH should be a relative path to the define_trace.h ../../drivers/lightnvm is the correct relative path. ../../../drivers/lightnvm is working by coincidence because the top Makefile adds -I$(srctree)/arch/$(SRCARCH)/include as a header search path, but we should not rely on it. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/lightnvm/pblk-trace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4